backporting to 2.4

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1329873 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/docs/manual/developer/modguide.xml b/docs/manual/developer/modguide.xml
index bec33a5b230a3179c9ca480ea13ade844c481e86..4253842d079c181a0826ab2968aff0d047d61f35 100644 (file)
--- a/docs/manual/developer/modguide.xml
+++ b/docs/manual/developer/modguide.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE manualpage SYSTEM "../style/manualpage.dtd">
 <?xml-stylesheet type="text/xsl" href="../style/manual.en.xsl"?>
 
-<!-- $LastChangedRevision: 1329859 $ -->
+<!-- $LastChangedRevision: 1329872 $ -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
@@ -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 -->