refactor for 7.2

[m6w6/ext-http] / .gitignore

diff --git a/.gitignore b/.gitignore
index 4f36007528471f591de8585454a686f444f9000f..15cb267257c54706212926e479507a906c1161c2 100644 (file)
--- 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,40 +76,4 @@ 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