X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=.gitignore;fp=.gitignore;h=84ed7bdb7a71e97b31d467b90f153c5b983d6591;hb=34cf4f968848bf2ba58ab2ff4e071b5d74fe61f3;hp=4f36007528471f591de8585454a686f444f9000f;hpb=4962f41e34a5d97f9befbda8880ebc183e36a8e0;p=m6w6%2Fext-http

diff --git a/.gitignore b/.gitignore
index 4f36007..84ed7bd 100644
--- 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,5 +107,4 @@ php_http_response_codes.h
 php_http_url.h
 php_http_utf8.h
 php_http_version.h
->>>>>>> v2.6.x
 *.gcov