From a7918a35e25a09882c48ec750f053b95b05c66e9 Mon Sep 17 00:00:00 2001
From: isUnknown <adrien.payet@outlook.com>
Date: Fri, 12 Dec 2025 13:09:06 +0100
Subject: [PATCH] update gitignore

---
 .gitignore | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1b50b83..df5f869 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,12 +23,9 @@ dist-ssr
 *.sln
 *.sw?
 
-<<<<<<< HEAD
 .claude
-=======
 # Variables d'environnement Brevo
 api/.env
 
 # Guide d'intégration (contient des informations sensibles)
 GUIDE-INTEGRATION-MONDIAL-RELAY.md
->>>>>>> 2f3af0e (product images : use first image as cover, integrate gallery structure and preserve files sorting)