Merge conflict
This commit is contained in:
@@ -20,5 +20,6 @@ install:
|
|||||||
- echo nothing
|
- echo nothing
|
||||||
|
|
||||||
script:
|
script:
|
||||||
|
- make deps
|
||||||
- make build-devserver
|
- make build-devserver
|
||||||
- make test-devserver
|
- make test-devserver
|
||||||
|
|||||||
Reference in New Issue
Block a user