j'ai oublié d'enlever head

2 years ago · f3b1db2903
parent 5f10a4b94d
commit f3b1db2903
1 changed files with 0 additions and 1 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -3,7 +3,6 @@ type: docker
 name: pipelinefordeveloppement

 trigger:
-<<<<<<< HEAD
  branch:
    - developpement
    - master