From: Michael Wallner <mike@php.net>
Date: Fri, 30 Sep 2016 10:12:36 +0000 (+0200)
Subject: remove leftover merge conflict
X-Git-Tag: RELEASE_3_1_0_RC1~18
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=34cf4f968848bf2ba58ab2ff4e071b5d74fe61f3;p=m6w6%2Fext-http

remove leftover merge conflict

Thanks @rcanavan
---

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