diff options
| author | Bdale Garbee <bdale@gag.com> | 2013-12-19 01:56:17 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2013-12-19 01:56:17 -0700 |
| commit | cf05119040c45bfd1a0f63fcaae5dcf7a2556639 (patch) | |
| tree | cafd765d33e118236a9cd348e3afd7d018302da0 /ChangeLog | |
| parent | 192791171c93c2008fa11a9f3bf1a2da2e14ea08 (diff) | |
fix missed merge conflict
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -4163,7 +4163,6 @@ Date: Wed May 15 01:24:56 2013 -0700 altos: Add flash-loader for telescience-v0.2 Signed-off-by: Keith Packard <keithp@keithp.com> ->>>>>>> branch-1.3 commit 116d8570766fbd3ef529111171935637a2e466af Author: Keith Packard <keithp@keithp.com> |