X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b7939ba67cd4ea72120bd956980306a915d3ac67..d9c56385acbd04a76cefe76f8acd4fe6407e52ee:/doc/patchqueue/disappearing_pages.mdwn

diff --git a/doc/patchqueue/disappearing_pages.mdwn b/doc/patchqueue/disappearing_pages.mdwn
index 434859d43..d699d5b6c 100644
--- a/doc/patchqueue/disappearing_pages.mdwn
+++ b/doc/patchqueue/disappearing_pages.mdwn
@@ -4,7 +4,9 @@ failing gracefully, and allowing the user to commit a new file with the same
 name if desired.
 
 The patch is [here](http://ikidev.betacantrips.com//patches/disappear.patch).
-It requires a strip level of 4 -- sorry about that. --Ethan
+It requires a strip level of 4 -- sorry about that. There are also some
+other changes in the conflict-resolution section which seemed to make sense,
+let me know what you think. --Ethan
 
     diff -urX /home/glasserc/ignorepats /home/glasserc/ikiclean/IkiWiki/CGI.pm /home/glasserc/ikidev/IkiWiki/CGI.pm
     --- /home/glasserc/ikiclean/IkiWiki/CGI.pm	2007-02-11 21:40:32.419641000 -0800