From 53b434e40047fc4e085f57412b4e2227faddf23b Mon Sep 17 00:00:00 2001 From: Micael Karlberg Date: Wed, 9 Nov 2011 17:30:56 +0100 Subject: Aftermerge cleanup. --- lib/inets/src/http_server/httpd_request_handler.erl | 6 ------ 1 file changed, 6 deletions(-) (limited to 'lib/inets/src/http_server') 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 -- cgit v1.2.3