Skip to content

Commit f37336a

Browse files
committed
Fix merge conflict
2 parents 4fc8f12 + 8031c3f commit f37336a

19 files changed

+299
-189
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@ composer.lock
66
*.sublime-project
77
*.sublime-workspace
88
*.project
9+
.idea/

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
language: php
22

33
php:
4-
- 5.4
54
- 5.5
65
- 5.6
76

0 commit comments

Comments
 (0)