diff --git a/.drone.yml b/.drone.yml
index 2220b8b..63d2338 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -3,7 +3,6 @@ type: docker
 name: pipelinefordeveloppement
 
 trigger:
-<<<<<<< HEAD
   branch:
     - developpement
     - master