aboutsummaryrefslogtreecommitdiff
path: root/doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'doc/bugs/crashes_in_the_python_proxy_even_if_disabled.mdwn')
-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 746a56f6f..3d5b05618 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
@@ -70,3 +70,5 @@ error: ikiwiki failed
> > > > (I'm trying to review some of the pending patches.) --[[smcv]]
>>>>> Ooops.. I forgot to push the branch, it should be good now! --[[anarcat]]
+
+>>>>>> [[merged|done]] --[[Joey]]