From 5e0237c8448d930fdfb413ec02bb91cfffde2b7c Mon Sep 17 00:00:00 2001
From: Germano Massullo <germano.massullo@gmail.com>
Date: Nov 06 2015 13:36:48 +0000
Subject: cleaned git conflict messages


---

diff --git a/darktable.spec b/darktable.spec
index c060c9c..0e6747b 100644
--- a/darktable.spec
+++ b/darktable.spec
@@ -3,7 +3,12 @@
 
 Name: darktable
 Version: 1.6.9
+<<<<<<< HEAD
 Release: 2%{?dist}
+=======
+Release: 3%{?dist}
+
+>>>>>>> master
 Summary: Utility to organize and develop raw images
 
 Group: Applications/Multimedia
@@ -51,7 +56,7 @@ BuildRequires: opencl-headers
 Requires: gtk2-engines
 
 # uses xmmintrin.h
-ExclusiveArch: %{ix86} x86_64
+ExclusiveArch: x86_64
 
 
 %description
@@ -133,6 +138,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_datadir}/man/man1/darktable-cli.1.gz
 
 %changelog
+<<<<<<< HEAD
+=======
+
+=======
+* Fri Nov 06 2015 Germano Massullo <germano.massullo@gmail.com> - 1.6.9-3
+- Removed x86 32 bit CPU support
+
+>>>>>>> master
 * Wed Nov 04 2015 Ralf Corsépius <corsepiu@fedoraproject.org> - 1.6.9-2
 - Rework bundled opencl-headers handling in %%prep (RHBZ#1264933).