Merge branch 'branch-1.3' into debian

[fw/altos] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 1a16bd7fa3b86b1d224222617fa1e0f69045b344..4f9316a19c90d41dcb2127f3d932438fea280dc7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4163,6 +4163,7 @@ 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>