You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by hu...@apache.org on 2012/04/24 19:28:39 UTC
svn commit: r1329872 - /httpd/httpd/trunk/docs/manual/developer/modguide.xml
Author: humbedooh
Date: Tue Apr 24 17:28:39 2012
New Revision: 1329872
URL: http://svn.apache.org/viewvc?rev=1329872&view=rev
Log:
stupid, stupid svn made a booboo
Modified:
httpd/httpd/trunk/docs/manual/developer/modguide.xml
Modified: httpd/httpd/trunk/docs/manual/developer/modguide.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/developer/modguide.xml?rev=1329872&r1=1329871&r2=1329872&view=diff
==============================================================================
--- httpd/httpd/trunk/docs/manual/developer/modguide.xml (original)
+++ httpd/httpd/trunk/docs/manual/developer/modguide.xml Tue Apr 24 17:28:39 2012
@@ -1622,12 +1622,8 @@ static int example_handler(request_req *
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*
}
return OK;
}
-<<<<<<< .mine
-</highlight>
-=======
</highlight>
->>>>>>> .r1329854
+
<!-- END EXAMPLE CODE -->