Skip to content

Commit 73744ab

Browse files
ShMcKShMcK
committed
resolve travis merge conflict
2 parents 51cffe3 + 857d830 commit 73744ab

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ node_js:
33
- "6.1"
44
- "5.11"
55
script: npm test
6-
before_script: npm run mocks
6+
before_script: npm run mocks

0 commit comments

Comments
 (0)