From: https://id.koumbit.net/anarcat <https://id.koumbit.net/anarcat@web>
Date: Tue, 25 Feb 2014 04:05:31 +0000 (-0400)
Subject: pushed the branch, sorry!!
X-Git-Tag: debian/3.20140227~2^2
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/d28d4447de8da999e208afedb6a4feb019644973

pushed the branch, sorry!!
---

diff --git a/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn b/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn
index 4af8c9f72..746a56f6f 100644
--- a/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn
+++ b/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn
@@ -68,3 +68,5 @@ error: ikiwiki failed
 
 > > > > I don't see that branch in your git repo, could you repost it please?
 > > > > (I'm trying to review some of the pending patches.) --[[smcv]]
+
+>>>>> Ooops.. I forgot to push the branch, it should be good now! --[[anarcat]]