X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Fao-load%2Fao-load.c;h=c27fcbe9c4d191bcb3005f9e7d2964e2eaba3c00;hp=642af2fed7ada02beccf08c2fe4e1fe35c9b1e3a;hb=cd5ce661e2a8f9694933358ccb5b916fbed089c2;hpb=d996aa9b32fb0eb385bd3d158256c29788a42fe3

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)
 {