diff options
| author | Bdale Garbee <bdale@gag.com> | 2009-08-18 18:13:48 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2009-08-18 18:13:48 -0600 |
| commit | d861218bc6c2f57816953af3271d93fc48f8afc2 (patch) | |
| tree | 4e101f7832d5bf390ac1a9f02d8b3043c46a4811 | |
| parent | 3f953f56fbfd4e903c09ca1e4309664d38c2c669 (diff) | |
fix merge conflict
| -rw-r--r-- | ao-tools/ao-load/ao-load.c | 4 |
1 files changed, 0 insertions, 4 deletions
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) { |