--- a/hgext3rd/evolve/metadata.py	Fri Oct 13 10:18:52 2017 +0530
+++ b/hgext3rd/evolve/metadata.py	Fri Oct 13 20:32:50 2017 +0200
@@ -6,6 +6,7 @@
 # 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/'