From 34cf4f968848bf2ba58ab2ff4e071b5d74fe61f3 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 30 Sep 2016 12:12:36 +0200
Subject: [PATCH] remove leftover merge conflict

Thanks @rcanavan
---
 .gitignore | 4 ----
 1 file changed, 4 deletions(-)

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
-- 
2.30.2