[checkmk-commits] Check_MK Git: check_mk: werk: remove GIT conflict markers from ChangeLog

Module: check_mk Branch: master Commit: 2ddaa4d28a4342bd9364c2eaab805e0cc20583bd URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=2ddaa4d28a4342… Author: Mathias Kettner &lt;mk(a)mathias-kettner.de&gt; Date: Thu Dec 5 11:09:07 2013 +0100 werk: remove GIT conflict markers from ChangeLog --- werk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/werk b/werk index edac4d5..0a2dfe0 100755 --- a/werk +++ b/werk @@ -124,7 +124,8 @@ def rewrite_changelog(*args): ch.readline() # skip current version while True: line = ch.readline() - if not line[0].isspace(): + # Konfliktmarker einfach ignorieren + if line[0] not in [ '\n', ' ', '\t', '<', '>', '=' ]: break oldlines = [line] + ch.readlines()