From 6144b3937601ab2df0f1f9c2f55e0b656e087049 Mon Sep 17 00:00:00 2001
From: baude <bbaude@redhat.com>
Date: Sep 15 2017 20:03:52 +0000
Subject: Fix typo in spec from cherry-pick


---

diff --git a/atomic.spec b/atomic.spec
index 3ec4e36..a70e9d6 100644
--- a/atomic.spec
+++ b/atomic.spec
@@ -123,16 +123,9 @@ cd ..
 tar zxf %{SOURCE1}
 
 %build
-<<<<<<< HEAD
 cd ..
-pushd registries-%{commit_atomic_registries}
-sh ./autogen.sh
-%configure
-%make_build
-=======
 pushd ../registries-%{commit_atomic_registries}
 make PYTHON=%{__python} all
->>>>>>> 336bf59... Updated registries package/atomic package
 popd
 pushd atomic-%{commit}
 if [ %{pypkg} == 'python3' ]; then