[wxsqlite3/f20] <<<<<<< HEAD

[Martin Gansser]

commit 84d244e746478089df7b761fe57165e65f367734
Author: Martin Gansser <mgansser at alice.de>
Date:   Sun Jan 4 12:56:06 2015 +0100

    <<<<<<< HEAD

 wxsqlite3.spec |   16 +---------------
 1 files changed, 1 insertions(+), 15 deletions(-)
---
diff --git a/wxsqlite3.spec b/wxsqlite3.spec
index 3466d7e..5dee947 100644
--- a/wxsqlite3.spec
+++ b/wxsqlite3.spec
@@ -1,12 +1,8 @@
-%global wxversion %(/bin/wx-config --release)
+%global wxversion %(wx-config --release)
 %global wxincdir %{_includedir}/wx-%{wxversion}
 
 Name:           wxsqlite3
-<<<<<<< HEAD
-Version:        3.1.1
-=======
 Version:        3.2.0
->>>>>>> master
 Release:        1%{?dist}
 Summary:        C++ wrapper around the SQLite 3.x database
 
@@ -90,11 +86,7 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 # install own Debian-compatible pkgconfig file
 mkdir -p ${RPM_BUILD_ROOT}%{_libdir}/pkgconfig
-<<<<<<< HEAD
-sed -e "s!@VERSION@!3.1.1!" \
-=======
 sed -e "s!@VERSION@!3.2.0!" \
->>>>>>> master
 	-e "s!@LIBDIR@!%{_lib}!" \
 	-e "s!@WXVERSION@!%{wxversion}!g" \
         %{SOURCE1} > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}-%{wxversion}.pc
@@ -119,11 +111,6 @@ sed -e "s!@VERSION@!3.2.0!" \
 
 
 %changelog
-<<<<<<< HEAD
-* Mon Jun 30 2014 Martin Gansser <martinkg at fedoraproject.org> 3.1.1-1
-- update to 3.1.1
-- added absolute path for wx-config
-=======
 * Sun Jan 04 2015 Martin Gansser <martinkg at fedoraproject.org> 3.2.0-1
 - update to 3.2.0
 
@@ -132,7 +119,6 @@ sed -e "s!@VERSION@!3.2.0!" \
 
 * Mon Jun 30 2014 Martin Gansser <martinkg at fedoraproject.org> 3.1.1-1
 - update to 3.1.1
->>>>>>> master
 
 * Mon Jun 02 2014 Martin Gansser <martinkg at fedoraproject.org> 3.1.0-2
 - dropped CXXFLAGS to avoid compiler warnings