From fac332d1e5aa0f04c8d7fdd4badd2b77435bad260641293ac533ebf83efda499 Mon Sep 17 00:00:00 2001 From: Alexandre Rogoski Date: Mon, 14 Jan 2013 12:31:20 +0000 Subject: [PATCH] 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 --- python-setuptools-git.changes | 1 - 1 file changed, 1 deletion(-) diff --git a/python-setuptools-git.changes b/python-setuptools-git.changes index 1be40ac..a088407 100644 --- a/python-setuptools-git.changes +++ b/python-setuptools-git.changes @@ -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: