From: Daniel Gruno <humbedooh@apache.org>
Date: Tue, 24 Apr 2012 17:28:39 +0000 (+0000)
Subject: stupid, stupid svn made a booboo
X-Git-Tag: 2.5.0-alpha~7063
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cc88e7cae59df517ef25004870f99947cb793465;p=thirdparty%2Fapache%2Fhttpd.git

stupid, stupid svn made a booboo

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1329872 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/docs/manual/developer/modguide.xml b/docs/manual/developer/modguide.xml
index d2dde837d25..f03911eec82 100644
--- a/docs/manual/developer/modguide.xml
+++ b/docs/manual/developer/modguide.xml
@@ -1622,12 +1622,8 @@ static int example_handler(request_req *r)
         ap_rprintf(r, &quot;&lt;b&gt;%s&lt;/b&gt;: %s&lt;br/&gt;&quot;, e[i].key, e[i].val);
     }
     return OK;
-<<<<<<< .mine
 }
 </highlight>
-=======
-}</highlight>
->>>>>>> .r1329854
 <!-- END EXAMPLE CODE -->
 
 
@@ -1685,11 +1681,8 @@ static int example_handler(request_req* r)
     }
     return OK;
 }
-<<<<<<< .mine
-</highlight>
-=======
     </highlight>
->>>>>>> .r1329854
+
 <!-- END EXAMPLE CODE -->