X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ChangeLog;fp=ChangeLog;h=4f9316a19c90d41dcb2127f3d932438fea280dc7;hb=575bbaf976c5840fd0e308549c45a466fdec1352;hp=1a16bd7fa3b86b1d224222617fa1e0f69045b344;hpb=bc3610d8cecbfed40c62d4dcb93fc9a4d2a7c9e3;p=fw%2Faltos

diff --git a/ChangeLog b/ChangeLog
index 1a16bd7f..4f9316a1 100644
--- 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>