[dokuwiki/el5] * fix merge

[topdog]

commit 7444e9c4616e5ccbf8ed2f8bd59a3e92618f5406
Author: Andrew Colin Kissa <andrew at topdog.za.net>
Date:   Sat Oct 20 17:04:03 2012 +0200

    * fix merge

 dokuwiki.spec |   21 ---------------------
 1 files changed, 0 insertions(+), 21 deletions(-)
---
diff --git a/dokuwiki.spec b/dokuwiki.spec
index 5ad904b..9ba91ee 100644
--- a/dokuwiki.spec
+++ b/dokuwiki.spec
@@ -8,12 +8,6 @@ URL:		http://www.dokuwiki.org/dokuwiki
 Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-2012-10-13.tgz
 #Fedora specific patches to use fedora packaged libraries
 Patch1:		dokuwiki-rm-bundled-libs.patch
-#Patch2:         fix-CVE-2012-2129.patch
-=======
-Source0:	http://www.splitbrain.org/_media/projects/%{name}/%{name}-2012-10-13.tgz
-#Fedora specific patches to use fedora packaged libraries
-Patch1:		dokuwiki-rm-bundled-libs.patch
->>>>>>> master
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 Requires:	php-gd
@@ -42,11 +36,6 @@ Configures DokuWiki to run in SELinux enabled environments.
 %prep
 %setup -q -n %{name}-2012-10-13
 %patch1 -p1 
-#%patch2 -p1 
-=======
-%setup -q -n %{name}-2012-10-13
-%patch1 -p1 
->>>>>>> master
 
 chmod a-x inc/lang/az/*.{txt,html}
 
@@ -209,19 +198,9 @@ fi
 - Latest upstream
 - Fix Bugzilla bugs #844726, #840255, #795487, #741384, #840686, #835145
  
-=======
-* Sat Oct 20 2012 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.14.20121013
-- Latest upstream
-- Fix Bugzilla bugs #844726, #840255, #795487, #741384, #840686, #835145
-
-* Thu Aug 02 2012 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.13.20120125.b
-- Latest upstream
-- Fix Bugzilla bugs #844726, #840255, #795487, #741384, #840686, #835145
- 
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0-0.12.20110525.a
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
->>>>>>> master
 * Tue Apr 24 2012 Andrew Colin Kissa <andrew at topdog.za.net> - 0-0.11.20110525.a
 - Fix CVE-2012-2129
 - Fix Bugzilla bugs #815123