From f3b1db290371cf9133ef51e75bef1d8e700b6a38 Mon Sep 17 00:00:00 2001
From: "matheo.thierry" <Matheo.THIERRY@etu.uca.fr>
Date: Sat, 20 May 2023 08:50:42 +0200
Subject: [PATCH] =?UTF-8?q?j'ai=20oubli=C3=A9=20d'enlever=20head?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 1 -
 1 file changed, 1 deletion(-)

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