From c2c1e2a3f2628fcaf27fc9bb1208fa7501935621 Mon Sep 17 00:00:00 2001
From: Adam Miller <admiller@redhat.com>
Date: Tue, 27 Aug 2013 15:32:12 -0500
Subject: [PATCH] fix the "fix" that hit the wrong branch

---
 golang.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/golang.spec b/golang.spec
index 90262e4..5e3a573 100644
--- a/golang.spec
+++ b/golang.spec
@@ -18,7 +18,7 @@
 
 Name:		golang
 Version:	1.1.2
-Release:	1%{?dist}
+Release:	3%{?dist}
 Summary:	The Go Programming Language
 
 License:	BSD
@@ -250,6 +250,12 @@ cp -av %{SOURCE101} $RPM_BUILD_ROOT%{_sysconfdir}/prelink.conf.d/golang.conf
 
 
 %changelog
+* Tue Aug 27 2013 Adam Miller <maxamillion@fedoraproject.org> - 1.1.2-3
+- Revert incorrect merged changelog
+
+* Tue Aug 27 2013 Adam Miller <maxamillion@fedoraproject.org> - 1.1.2-2
+- This was reverted, just a placeholder changelog entry for bad merge
+
 * Tue Aug 20 2013 Adam Miller <maxamillion@fedoraproject.org> - 1.1.2-1
 - Update to latest upstream