remove unwanted/needed merge remnants

change base address git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.17-protocols-http2@1703270 13f79535-47bb-0310-9956-ffa450edef68
git-mirror · Sep 15, 2015 · 9eba5bd · 9eba5bd
1 parent 457bbe3
commit 9eba5bd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/BuildBin.dsp b/BuildBin.dsp
diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref
@@ -127,5 +127,4 @@ mod_optional_fn_import.so   0x70BC0000    0x00010000
 mod_optional_hook_export.so 0x70BD0000    0x00010000
 mod_optional_hook_import.so 0x70BE0000    0x00010000
 mod_authnz_fcgi.so          0x70BF0000    0x00020000
-mod_h2.so                   0x70D00000    0x00020000
->>>>>>> .merge-right.r1698023
+mod_h2.so                   0x70C10000    0x00020000