Fix merge conflicts that weren't reported correctly in last commit

deliciousbrains · Jul 22, 2022 · 0311692 · 0311692
1 parent 389952a
commit 0311692
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,8 @@
 language: php
 
 php:
-<<<<<<< Updated upstream
-=======
   - 7.1
   - 7.2
->>>>>>> Stashed changes
   - 7.3
   - 7.4
 

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 
 ## Prerequisites
 
-WP_Queue requires PHP __7.3+__.
+WP_Queue requires PHP __7.1+__.
 
 The following database tables need to be created:
 

diff --git a/composer.json b/composer.json
@@ -14,11 +14,7 @@
         }
     ],
     "require": {
-<<<<<<< Updated upstream
-        "php": ">=7.3",
-=======
         "php": ">=7.1.8",
->>>>>>> Stashed changes
         "nesbot/carbon": "^2.0"
     },
     "autoload": {