[rawtherapee: 3/3] Resolve conflict

[Thibault North]

commit 90d6bbb205cd4159f162441c2dc14aa791b86279
Author: Thibault North <tnorth at fedoraproject.org>
Date:   Sun Dec 19 12:25:20 2010 -0500

    Resolve conflict

 rawtherapee.spec |    7 -------
 1 files changed, 0 insertions(+), 7 deletions(-)
---
diff --git a/rawtherapee.spec b/rawtherapee.spec
index 816be01..08c7885 100644
--- a/rawtherapee.spec
+++ b/rawtherapee.spec
@@ -13,11 +13,7 @@
 
 Name:           rawtherapee
 Version:        3.0
-<<<<<<< HEAD
 Release:        0.26.%{prerelease}%{?dist}
-=======
-Release:        0.25.%{prerelease}%{?dist}
->>>>>>> 085801456dbe67dae4791fb7900e5f618fad25e5
 Summary:        Raw image processing software
 
 Group:          Applications/Multimedia 
@@ -116,12 +112,9 @@ fi || :
 %{_datadir}/icons/hicolor/32x32/apps/rawtherapee.png
 
 %changelog
-<<<<<<< HEAD
 * Sun Dec 19 2010 Thibault North <tnorth at fedoraproject.org> - 3.0-0.26.a1
 - Sync with branch_3.0 upstream: rawtherapee has a stable branch now.
 
-=======
->>>>>>> 085801456dbe67dae4791fb7900e5f618fad25e5
 * Sat Nov 6 2010 Dan Horák <dan[at]danny.cz> - 3.0-0.25.a1
 - Fix libdir for 64-bit architectures
 - Fix ownership of the /usr/share/rawtherapee directory