kubo pushed to vertica-python (f20). "Remove forgotten merge conflicts"

[notifications at fedoraproject.org]

>From f30bc8384c2527d9faf6dc48f5c8f5f88557e78f Mon Sep 17 00:00:00 2001
From: Jakub Jedelsky <jakub.jedelsky at gmail.com>
Date: Wed, 8 Apr 2015 23:43:29 +0200
Subject: Remove forgotten merge conflicts


diff --git a/vertica-python.spec b/vertica-python.spec
index 4f59f0c..c56be45 100644
--- a/vertica-python.spec
+++ b/vertica-python.spec
@@ -2,11 +2,7 @@
 %{!?python2_sitelib: %global python2_sitelib %(%{__python2} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 Name:           vertica-python
-<<<<<<< HEAD
-Version:        0.3.4
-=======
 Version:        0.3.5
->>>>>>> master
 Release:        1%{?dist}
 Summary:        A native Python adapter for the Vertica database
 
@@ -73,12 +69,9 @@ vertica-python is a native Python adapter for the Vertica
 * Fri Jun 13 2014 Jakub Jedelsky <jakub.jedelsky at gmail.com> - 0.2.3-1
 - update to new version
 
-<<<<<<< HEAD
-=======
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.2.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
->>>>>>> master
 * Thu Apr 24 2014 Jakub Jedelsky <jakub.jedelsky at gmail.com> - 0.2.1-1
 - new version update
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/vertica-python.git/commit/?h=f20&id=f30bc8384c2527d9faf6dc48f5c8f5f88557e78f