From: Bdale Garbee <bdale@gag.com>
Date: Wed, 19 Aug 2009 00:13:48 +0000 (-0600)
Subject: fix merge conflict
X-Git-Tag: debian/1.1-1~21
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=d861218bc6c2f57816953af3271d93fc48f8afc2;p=fw%2Faltos

fix merge conflict
---

diff --git a/ao-tools/ao-load/ao-load.c b/ao-tools/ao-load/ao-load.c
index 642af2fe..c27fcbe9 100644
--- a/ao-tools/ao-load/ao-load.c
+++ b/ao-tools/ao-load/ao-load.c
@@ -89,9 +89,6 @@ rewrite(struct hex_image *image, unsigned addr, char *data, int len)
 	memcpy(image->data + addr - image->address, data, len);
 }
 
-<<<<<<< HEAD:ao-tools/ao-load/ao-load.c
-static const struct option
-=======
 static const struct option options[] = {
 	{ .name = "tty", .has_arg = 1, .val = 'T' },
 	{ 0, 0, 0, 0},
@@ -103,7 +100,6 @@ static void usage(char *program)
 	exit(1);
 }
 
->>>>>>> c29275b72438637d46d7a50742882d2736eb176a:ao-tools/ao-load/ao-load.c
 int
 main (int argc, char **argv)
 {