Merge branch 'master' into fancypodcast

[git.ikiwiki.info.git] / doc / todo / Silence_monotone_warning.mdwn

diff --git a/doc/todo/Silence_monotone_warning.mdwn b/doc/todo/Silence_monotone_warning.mdwn
index e3f0224c2eb4fc890cf347e2207ef1d06bd437fe..d875900c5b52c3f37070922f6f30b6aff71421e6 100644 (file)
--- a/doc/todo/Silence_monotone_warning.mdwn
+++ b/doc/todo/Silence_monotone_warning.mdwn
@@ -4,7 +4,7 @@ A quick [[patch]] to silence a [[rcs/monotone]] warning I started seeing:
     index 4b9be31..9d4e280 100644
     --- a/IkiWiki/Plugin/monotone.pm
     +++ b/IkiWiki/Plugin/monotone.pm
     index 4b9be31..9d4e280 100644
     --- a/IkiWiki/Plugin/monotone.pm
     +++ b/IkiWiki/Plugin/monotone.pm

-    @@ -55,7 +55,7 @@ sub checkconfig () { #{{{
+    @@ -55,7 +55,7 @@ sub checkconfig () {

                error("Monotone version too old, is $version but required 0.38");
        }
      
                error("Monotone version too old, is $version but required 0.38");
        }