chore(travis): Stop making travis try to build the client

2018-10-05 16:01:12 +01:00
parent 3aa934a9c8
commit d2249ab01c
1 changed files with 1 additions and 7 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -24,10 +24,4 @@ before_script:
  - git config --global user.name "CamperBot"

 script:
-<<<<<<< HEAD
-  - npm run test-ci
-=======
-  - npm run test
-  - cd ./client
-  - npm run build
->>>>>>> fix(ci-build): Make it so, Travis
+  - npm run test