aboutsummaryrefslogtreecommitdiff
path: root/doc/bugs/http_proxy_for_openid.mdwn
diff options
context:
space:
mode:
authorAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2013-07-27 08:51:28 -0400
committerAmitai Schlair <schmonz-web-ikiwiki@schmonz.com>2013-07-27 10:15:16 -0400
commit89d9d25a2464aa57bd3698d7614cbefe5e6f4607 (patch)
treee765fbcbc450c39258c6f5902b4a8f0383e0a40a /doc/bugs/http_proxy_for_openid.mdwn
parent07cb6368aa2d6404ea24186be816b2d07afec071 (diff)
downloadikiwiki-89d9d25a2464aa57bd3698d7614cbefe5e6f4607.tar
ikiwiki-89d9d25a2464aa57bd3698d7614cbefe5e6f4607.tar.gz
Document my now much simpler patch.
Diffstat (limited to 'doc/bugs/http_proxy_for_openid.mdwn')
-rw-r--r--doc/bugs/http_proxy_for_openid.mdwn7
1 files changed, 3 insertions, 4 deletions
diff --git a/doc/bugs/http_proxy_for_openid.mdwn b/doc/bugs/http_proxy_for_openid.mdwn
index 566896ec3..4a9c1b3eb 100644
--- a/doc/bugs/http_proxy_for_openid.mdwn
+++ b/doc/bugs/http_proxy_for_openid.mdwn
@@ -79,8 +79,7 @@ Brian May
>>>>> installed, even with the above commit, `openid` won't be able to
>>>>> traverse a proxy. --[[schmonz]]
-[[!template id=gitbranch branch=schmonz/proxies author="[[schmonz]]"]]
+[[!template id=gitbranch branch=schmonz/proxy 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]]
+>>>>>> I've redone this from scratch, much more simply, on a new
+>>>>>> branch. --[[schmonz]].