Fix missed conflict line in changes file.

OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-setuptools-git?expand=0&rev=6
This commit is contained in:
Alexandre Rogoski 2013-01-14 12:31:20 +00:00 committed by Git OBS Bridge
parent 739f7dbf56
commit fac332d1e5

View File

@ -11,7 +11,6 @@ Mon Nov 19 14:54:59 UTC 2012 - cfarrell@suse.com
SPDX format (or SUSE version thereof)
-------------------------------------------------------------------
>>>>>>> ./python-setuptools-git/python-setuptools-git.changes.r2
Tue May 3 22:08:54 UTC 2011 - alexandre@exatati.com.br
- Update to 0.4.2: