diff options
| author | Daniel Gruno <humbedooh@apache.org> | 2012-04-24 19:28:39 +0200 |
|---|---|---|
| committer | Daniel Gruno <humbedooh@apache.org> | 2012-04-24 19:28:39 +0200 |
| commit | cc88e7cae59df517ef25004870f99947cb793465 (patch) | |
| tree | 412375f09998ac781f2d8144b49d8d9dcf9a3929 /docs/manual | |
| parent | Changing to <highlight> tags for syntax highlighting (diff) | |
| download | apache2-cc88e7cae59df517ef25004870f99947cb793465.tar.xz apache2-cc88e7cae59df517ef25004870f99947cb793465.zip | |
stupid, stupid svn made a booboo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1329872 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'docs/manual')
| -rw-r--r-- | docs/manual/developer/modguide.xml | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/docs/manual/developer/modguide.xml b/docs/manual/developer/modguide.xml index d2dde837d2..f03911eec8 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, "<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 --> |