From: Martin Taibr <taibr.martin@gmail.com>
Date: Fri, 20 Oct 2017 13:11:54 +0000 (+0200)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic.wiki
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=68df2def9842215c889966eac3897af83470e8bd;p=xonotic%2Fxonotic.wiki.git

Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic.wiki
---

68df2def9842215c889966eac3897af83470e8bd
diff --cc assets/check-and-fix.py
index 957eccb,92ef9a3..f69d206
--- a/assets/check-and-fix.py
+++ b/assets/check-and-fix.py
@@@ -31,7 -31,7 +31,7 @@@ def compile_regex(rgx: str)
      # regex (unlike re) supports non-constant length look-behinds
      return regex.compile(
          "".join(
-             [line.strip() for line in rgx.split('\n')]))
 -            [line.lstrip() for line in rgx]))
++            [line.lstrip() for line in rgx.split('\n')]))
  
  
  # examples: