X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/c4154e8a45615ab99f22aa2cfe42788f1ce974cc..b70a488b67e45ff99dfd8269cbddb5520e7d89af:/doc/bugs/http_proxy_for_openid.mdwn?ds=inline

diff --git a/doc/bugs/http_proxy_for_openid.mdwn b/doc/bugs/http_proxy_for_openid.mdwn
index b7ae76aeb..566896ec3 100644
--- a/doc/bugs/http_proxy_for_openid.mdwn
+++ b/doc/bugs/http_proxy_for_openid.mdwn
@@ -78,3 +78,9 @@ Brian May
 >>>>> explicitly removed", so if ikiwiki can preferentially find that 
 >>>>> installed, even with the above commit, `openid` won't be able to 
 >>>>> traverse a proxy. --[[schmonz]]
+
+[[!template id=gitbranch branch=schmonz/proxies author="[[schmonz]]"]]
+
+>>>>> I bollixed up my git, recloned, and reapplied the diffs, so
+>>>>> that commit won't exist anymore. My proxy-related changes are
+>>>>> now on a branch. --[[schmonz]]