X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=.gitignore;h=aeed8659f6c316185262d29c40e820b8f2e8a3ca;hp=348538c871f9b28e83aab75ed0d0bc888950a349;hb=6c1356cbe7363bf41f770b1dce59abef93dcc021;hpb=b3831bc5f19cf32880ea19341c3527f0e9553517

diff --git a/.gitignore b/.gitignore
index 348538c..aeed865 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,11 +42,12 @@ lcov_data
 *.phar
 !travis/*.phar
 vendor/
-<<<<<<< HEAD
 /php_http_api.h
 /php_http_buffer.h
 /php_http_client.h
 /php_http_client_curl.h
+/php_http_client_curl_event.h
+/php_http_client_curl_user.h
 /php_http_client_request.h
 /php_http_client_response.h
 /php_http_cookie.h
@@ -75,39 +76,6 @@ vendor/
 /php_http_utf8.h
 /php_http_version.h
 /tests/helper/server.log
-=======
-tests/helper/server.log
-php_http_api.h
-php_http_buffer.h
-php_http_client.h
-php_http_client_curl.h
-php_http_client_curl_event.h
-php_http_client_curl_user.h
-php_http_client_request.h
-php_http_client_response.h
-php_http_cookie.h
-php_http_curl.h
-php_http_encoding.h
-php_http_env.h
-php_http_env_request.h
-php_http_env_response.h
-php_http_etag.h
-php_http_exception.h
-php_http_filter.h
-php_http_header.h
-php_http_header_parser.h
-php_http_info.h
-php_http_message.h
-php_http_message_body.h
-php_http_message_parser.h
-php_http_misc.h
-php_http_negotiate.h
-php_http_object.h
-php_http_options.h
-php_http_params.h
-php_http_querystring.h
-php_http_response_codes.h
-php_http_url.h
-php_http_utf8.h
-php_http_version.h
->>>>>>> v2.6.x
+*.gcov
+*gcov
+*lcov