erichardson/py-eagle-mqtt
1
0
Fork 0
Code Issues 1 Pull Requests 5 Actions Packages Projects Releases 11 Wiki Activity

fix merge error

Browse Source
This commit is contained in:
Evan Richardson
2019-05-10 13:44:35 -07:00
parent 7aff09ce48
commit b85856266f
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@@ -23,7 +23,3 @@ build:
- docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG" - docker push "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG"
except: except:
- master - master
<<<<<<< HEAD
=======
>>>>>>> c80658da6110e2c9095cdbd249c5583509c16a7a