aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorhttps://id.koumbit.net/anarcat <https://id.koumbit.net/anarcat@web>2014-02-25 00:05:31 -0400
committeradmin <admin@branchable.com>2014-02-25 00:05:31 -0400
commitd28d4447de8da999e208afedb6a4feb019644973 (patch)
tree127774e21f589499b6da816f7b546522d51ba57e /doc
parent95fae0a5aca0c94a2022bc88ad5a08b5563cd656 (diff)
downloadikiwiki-d28d4447de8da999e208afedb6a4feb019644973.tar
ikiwiki-d28d4447de8da999e208afedb6a4feb019644973.tar.gz
pushed the branch, sorry!!
Diffstat (limited to 'doc')
-rw-r--r--doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn2
1 files changed, 2 insertions, 0 deletions
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]]