corr reste de merge

This commit is contained in:
Julien Cabillot 2017-06-01 14:47:27 +02:00 committed by Cabillot Julien
parent 25fa725fa5
commit ba3f9a3e4a

View File

@ -22,7 +22,6 @@ inocode:
- git clone "${GITREMDEB}" - git clone "${GITREMDEB}"
- cd "${CI_PROJECT_DIR}/arduino/${CI_PROJECT_NAME}" - cd "${CI_PROJECT_DIR}/arduino/${CI_PROJECT_NAME}"
- cp "${CI_PROJECT_NAME}.example.h" "${CI_PROJECT_NAME}.h" - cp "${CI_PROJECT_NAME}.example.h" "${CI_PROJECT_NAME}.h"
>>>>>>> 8904574aea20d843135b548ad44a254e42da4d2b
- /arduino-nightly/arduino --verify "${CI_PROJECT_NAME}.ino" - /arduino-nightly/arduino --verify "${CI_PROJECT_NAME}.ino"
yaml: yaml: