Fix travisCI

groteworld · web-flow · commit 607ce9fc550c · 2017-07-13T17:15:43.000-05:00
diff --git a/.travis.yml b/.travis.yml
@@ -8,8 +8,4 @@ install:
 # command to run tests
 script:
   - flake8 . --max-line-length=120
-<<<<<<< HEAD
   - pydocstyle . --add-ignore=D202
-=======
-  - pep257 . --add-ignore=D202,D211
->>>>>>> Update .travis.yml
