From 7f7fe680c20732a2b5879b3dfa5d81f966a89c54 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Thu, 4 Aug 2005 13:50:11 +0000
Subject: [PATCH] Fix conflict

---
 gtk2.spec | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/gtk2.spec b/gtk2.spec
index 4eab127..8bd7b30 100644
--- a/gtk2.spec
+++ b/gtk2.spec
@@ -10,11 +10,7 @@
 %define cairo_version %{cairo_base_version}-1
 %define libpng_version 2:1.2.2-16
 
-<<<<<<< gtk2.spec
 %define base_version 2.7.5
-=======
-%define base_version 2.7.4
->>>>>>> 1.85
 %define bin_version 2.4.0
 
 Summary: The GIMP ToolKit (GTK+), a library for creating GUIs for X.