fix missed merge conflict

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

diff --git a/configure.ac b/configure.ac
index 0b2960ce5fc0dd9a44481d4f21ac062b8d111399..b92e06a9af6d5696b2864a077269379526bf0036 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,11 +18,7 @@ dnl
 dnl Process this file with autoconf to create configure.
 
 AC_PREREQ(2.57)
-<<<<<<< HEAD
-AC_INIT([altos], 1.2.1)
-=======
 AC_INIT([altos], 1.3)
->>>>>>> branch-1.3
 AC_CONFIG_SRCDIR([src/core/ao.h])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 AM_MAINTAINER_MODE