diff options
| author | Micael Karlberg <[email protected]> | 2011-11-09 17:30:56 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-11-09 17:30:56 +0100 |
| commit | 53b434e40047fc4e085f57412b4e2227faddf23b (patch) | |
| tree | 93c878e712e9309469e8f1c2de80548e21f1143b /lib/inets | |
| parent | bab47a5fc14f5093ca0c9deca4297d54ea722eb8 (diff) | |
| download | otp-53b434e40047fc4e085f57412b4e2227faddf23b.tar.gz otp-53b434e40047fc4e085f57412b4e2227faddf23b.tar.bz2 otp-53b434e40047fc4e085f57412b4e2227faddf23b.zip | |
Aftermerge cleanup.
Diffstat (limited to 'lib/inets')
| -rw-r--r-- | lib/inets/src/http_server/httpd_request_handler.erl | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/inets/src/http_server/httpd_request_handler.erl b/lib/inets/src/http_server/httpd_request_handler.erl index e07c7b0cd4..d2f22fce93 100644 --- a/lib/inets/src/http_server/httpd_request_handler.erl +++ b/lib/inets/src/http_server/httpd_request_handler.erl @@ -1,14 +1,8 @@ %% %% %CopyrightBegin% -<<<<<<< HEAD -%% -%% Copyright Ericsson AB 1997-2011. All Rights Reserved. -%% -======= %% %% Copyright Ericsson AB 1997-2011. All Rights Reserved. %% ->>>>>>> bmk/inets/httpd/xss_when_erl_encoded/r13/OTP-9655 %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in %% compliance with the License. You should have received a copy of the |