From 5f348f81b9de8e75ae39831a6ebc5f7b284c44af Mon Sep 17 00:00:00 2001
From: wilsonge <georgejameswilson@googlemail.com>
Date: Mon, 19 Aug 2019 20:53:36 +0100
Subject: [PATCH] Fix merge conflict

---
 .travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 2bbc89c..3f685bf 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,6 @@ matrix:
   fast_finish: true
   include:
     - php: 5.6
-      env: RUN_PHPCS="yes"
     - php: 7.0
       env: RUN_PHPCS="yes"
       sudo: true