[wxsqlite3/f18] update to 3.0.2

[Martin Gansser]

commit f79e1da06e8de06d53f82de9c942d465ad656cfa
Author: Martin Gansser <mgansser at alice.de>
Date:   Sat Feb 16 21:17:31 2013 +0100

    update to 3.0.2
    
    - rebuild for new release

 wxsqlite3.spec |   12 ------------
 1 files changed, 0 insertions(+), 12 deletions(-)
---
diff --git a/wxsqlite3.spec b/wxsqlite3.spec
index 69036d8..3c187e2 100644
--- a/wxsqlite3.spec
+++ b/wxsqlite3.spec
@@ -2,13 +2,8 @@
 %global wxincdir %{_includedir}/wx-%{wxversion}
 
 Name:           wxsqlite3
-<<<<<<< HEAD
-Version:        3.0.1
-Release:        4%{?dist}
-=======
 Version:        3.0.2
 Release:        1%{?dist}
->>>>>>> master
 Summary:        C++ wrapper around the SQLite 3.x database
 
 Group:          System Environment/Libraries
@@ -90,11 +85,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.0.1!" \
-=======
 sed -e "s!@VERSION@!3.0.2!" \
->>>>>>> master
 	-e "s!@LIBDIR@!%{_lib}!" \
 	-e "s!@WXVERSION@!%{wxversion}!g" \
         %{SOURCE1} > $RPM_BUILD_ROOT%{_libdir}/pkgconfig/%{name}-%{wxversion}.pc
@@ -119,8 +110,6 @@ sed -e "s!@VERSION@!3.0.2!" \
 
 
 %changelog
-<<<<<<< HEAD
-=======
 * Sat Feb 16 2013 Martin Gansser <martinkg at fedoraproject.org> 3.0.2-1
 - update to 3.0.2
 - rebuild for new release
@@ -128,7 +117,6 @@ sed -e "s!@VERSION@!3.0.2!" \
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
->>>>>>> master
 * Wed Dec 26 2012 Martin Gansser <martinkg at fedoraproject.org> 3.0.1-4
 - added own Debian-compatible pkgconfig file
 - specfile cleanup