[OpenImageIO/f18: 3/3] Fix merge conflicts.

[Richard Shaw]

commit 15e17eb566f9fe0824782d6690d649b989e2f251
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Wed Aug 28 14:17:16 2013 -0500

    Fix merge conflicts.

 OpenImageIO.spec |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/OpenImageIO.spec b/OpenImageIO.spec
index 96913ea..7525370 100644
--- a/OpenImageIO.spec
+++ b/OpenImageIO.spec
@@ -1,11 +1,6 @@
 Name:           OpenImageIO
-<<<<<<< HEAD
 Version:        1.0.12
 Release:        1%{?dist}
-=======
-Version:        1.0.11
-Release:        2%{?dist}
->>>>>>> 9a30ce92df4cfbcc8aa2a22d54e197e49f13b31e
 Summary:        Library for reading and writing images
 
 Group:          Development/Libraries
@@ -164,7 +159,6 @@ cp -a doc/*.1 %{buildroot}%{_mandir}/man1
 
 
 %changelog
-<<<<<<< HEAD
 * Wed Aug 28 2013 Richard Shaw <hobbes1069 at gmail.com> - 1.0.12-1
 - Update to latest upstream patch release.