Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / ao-tools / ao-load / ao-load.c

diff --git a/ao-tools/ao-load/ao-load.c b/ao-tools/ao-load/ao-load.c
index c27fcbe9c4d191bcb3005f9e7d2964e2eaba3c00..642af2fed7ada02beccf08c2fe4e1fe35c9b1e3a 100644 (file)
--- a/ao-tools/ao-load/ao-load.c
+++ b/ao-tools/ao-load/ao-load.c
@@ -89,6 +89,9 @@ rewrite(struct hex_image *image, unsigned addr, char *data, int len)
        memcpy(image->data + addr - image->address, data, 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},
 static const struct option options[] = {
        { .name = "tty", .has_arg = 1, .val = 'T' },
        { 0, 0, 0, 0},


@@ -100,6 +103,7 @@ static void usage(char *program)
        exit(1);
 }
 
        exit(1);
 }
 

+>>>>>>> c29275b72438637d46d7a50742882d2736eb176a:ao-tools/ao-load/ao-load.c

 int
 main (int argc, char **argv)
 {
 int
 main (int argc, char **argv)
 {