# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1507941561 -7200
# Node ID ccbcd027ca77c6fb85cea78b6b3c6b64c01d6688
# Parent  0cd594fdfd75cac1b4cb266cdfbbd30b9fbf7564
metadata: cleanup metadata file

I'm not sure how this conflict marker survived the pre-publish test run...

diff -r 0cd594fdfd75 -r ccbcd027ca77 hgext3rd/evolve/metadata.py
--- a/hgext3rd/evolve/metadata.py	Fri Oct 13 20:32:50 2017 +0200
+++ b/hgext3rd/evolve/metadata.py	Sat Oct 14 02:39:21 2017 +0200
@@ -6,7 +6,6 @@
 # GNU General Public License version 2 or any later version.
 
 __version__ = '6.8.0.dev'
->>>>>>> merge rev:    6f87042766cb stable - pierre-yves: topic: remove a sill...
 testedwith = '3.8.4 3.9.2 4.0.2 4.1.3 4.2.3 4.3.2'
 minimumhgversion = '3.8'
 buglink = 'https://bz.mercurial-scm.org/'