remove leftover merge conflict

[m6w6/ext-http] / .gitignore

diff --git a/.gitignore b/.gitignore
index 348538c871f9b28e83aab75ed0d0bc888950a349..84ed7bdb7a71e97b31d467b90f153c5b983d6591 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -42,7 +42,6 @@ lcov_data
 *.phar
 !travis/*.phar
 vendor/
-<<<<<<< HEAD
 /php_http_api.h
 /php_http_buffer.h
 /php_http_client.h
@@ -75,8 +74,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
@@ -110,4 +107,4 @@ php_http_response_codes.h
 php_http_url.h
 php_http_utf8.h
 php_http_version.h
->>>>>>> v2.6.x
+*.gcov