stupid, stupid svn made a booboo

[apache] / docs / manual / developer / modguide.xml

diff --git a/docs/manual/developer/modguide.xml b/docs/manual/developer/modguide.xml
index d2dde837d250f9fa1b207ba103d581cdf24bfd70..f03911eec82bfc1490003ca22b09c88a234e2af6 100644 (file)
--- 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, "<b>%s</b>: %s<br/>", 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 -->