Mercurial > evolve
changeset 3063:ccbcd027ca77
metadata: cleanup metadata file
I'm not sure how this conflict marker survived the pre-publish test run...
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Sat, 14 Oct 2017 02:39:21 +0200 |
| parents | 0cd594fdfd75 |
| children | 9a223c3adb9d |
| files | hgext3rd/evolve/metadata.py |
| diffstat | 1 files changed, 0 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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/'