diff options
| author | Gregg Lewis Smith <gsmith@apache.org> | 2015-09-15 18:21:04 +0000 |
|---|---|---|
| committer | Gregg Lewis Smith <gsmith@apache.org> | 2015-09-15 18:21:04 +0000 |
| commit | 59683b7249993a966a42599cc002c7ec3daf7b14 (patch) | |
| tree | ca2c261537d5349891ea00d3f9b27087f11e4232 /os | |
| parent | f0965c60601871129f795b4df727068ea26106c3 (diff) | |
| download | httpd-59683b7249993a966a42599cc002c7ec3daf7b14.tar.gz | |
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
Diffstat (limited to 'os')
| -rw-r--r-- | os/win32/BaseAddr.ref | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/os/win32/BaseAddr.ref b/os/win32/BaseAddr.ref index 1a221f87a1..5fa19bdd1e 100644 --- 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 |