From 1becb5554c48b4ae9f008d7346c2b1e741922ecc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grand?= <francois.grand@inrae.fr>
Date: Wed, 31 May 2023 16:35:42 +0200
Subject: [PATCH] update jalhyd_branc to
 335-utiliser-des-identifiants-symboliques-plutot-que-numeriques-dans-les-fichiers

refs #621
---
 jalhyd_branch | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/jalhyd_branch b/jalhyd_branch
index 9426cd15..5a7919cd 100644
--- a/jalhyd_branch
+++ b/jalhyd_branch
@@ -1 +1,5 @@
+<<<<<<< Updated upstream
 302-structure-ajouter-une-erreur-sur-l-ennoiement
+=======
+335-utiliser-des-identifiants-symboliques-plutot-que-numeriques-dans-les-fichiers
+>>>>>>> Stashed changes
-- 
GitLab