tonyair/silverstripe-comments
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-comments synced 2024-10-22 11:05:49 +02:00
Code Issues Projects Releases Wiki Activity

Fix merge conflict

Browse Source
This commit is contained in:
Steve Boyd 2021-03-21 10:31:02 +13:00
parent e6971b82c6
commit 9c3c1e8120
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -1,12 +1,8 @@
version: ~> 1.0 version: ~> 1.0
import: import:
<<<<<<< HEAD
- silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range.yml
=======
- silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range-npm.yml - silverstripe/silverstripe-travis-shared:config/provision/standard-jobs-range-npm.yml
env: env:
global: global:
- REQUIRE_EXTRA:"ezyang/htmlpurifier:*" - REQUIRE_EXTRA:"ezyang/htmlpurifier:*"
>>>>>>> 3.3