v1.7.12

2021-07-10 22:37:56 -07:00
parent 8ee0699b3e fcb18e56f0
commit 2369c9b3be
1 changed files with 1 additions and 6 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,11 +10,6 @@ before_script:
  - cp .env.travis .env
  - mysql -e 'create database homestead_test;'

-<<<<<<< HEAD
 # phpunit testing is disabled as dist vendor is cleared by removing unneeded files
 #script:
 #  - vendor/bin/phpunit
-=======
-script:
-  - vendor/bin/phpunit
->>>>>>> fcb18e56f0ef2ee4622ec16073a1ed2c9f329ec4