Fixed #5: Conflicts in phpmd

Yaroslav Voronoy · Yaroslav Voronoy · commit d1b2bd36df21 · 2016-12-12T18:09:35.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,5 @@
 language: php
 php:
-- 5.5
 - 5.6
 - 7.0
 install:

-Original file line number
+Diff line change
@@ @@ -1,6 +1,5 @@ @@
 language: php
 php:
 -- 5.5
 - 5.6
 - 7.0
 install: