From cf05119040c45bfd1a0f63fcaae5dcf7a2556639 Mon Sep 17 00:00:00 2001
From: Bdale Garbee <bdale@gag.com>
Date: Thu, 19 Dec 2013 01:56:17 -0700
Subject: [PATCH] fix missed merge conflict

---
 ChangeLog    | 1 -
 configure.ac | 4 ----
 2 files changed, 5 deletions(-)

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