From 2a01108f88d12d865dca38d63af08277a99dfd0a Mon Sep 17 00:00:00 2001
From: Laurent Pouilloux <laurent.pouilloux@inria.fr>
Date: Mon, 3 Feb 2025 19:47:45 +0100
Subject: [PATCH] =?UTF-8?q?[sophia][ipv4]=C2=A0add=20offset=20for=20estere?=
 =?UTF-8?q?l41=20and=20remove=20duplicate=20line=20for=20esterel31?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 input/grid5000/ipv4.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/input/grid5000/ipv4.yaml b/input/grid5000/ipv4.yaml
index 11a8504be3e..eb26d24b2c4 100644
--- a/input/grid5000/ipv4.yaml
+++ b/input/grid5000/ipv4.yaml
@@ -110,12 +110,9 @@ ipv4:
       rennes roazhon11 eth0 0 0 14 36
       rennes roazhon12 eth0 0 0 14 39
       rennes roazhon13 eth0 0 0 14 44
-<<<<<<< HEAD
-=======
       sophia uvb eth0 0 0 4 0
       sophia uvb ib0 0 0 4 0
       sophia esterel31 eth0 0 0 3 40
->>>>>>> 6eaab2f5e9 ([ipv4.yaml] add existing IB networks)
       sophia mercantour1 eth0 0 0 2 0
       sophia mercantour2 eth0 0 0 2 16
       sophia mercantour2 ib0  0 0 2 16
@@ -165,6 +162,7 @@ ipv4:
       sophia esterel39 eth0 0 0 3 52
       sophia esterel40 eth0 0 0 3 53
       sophia esterel41 eth0 0 0 3 55
+      sophia esterel41 ibs3 0 0 3 55
       sophia musa eth0 0 0 5 0
       sophia uvb eth0 0 0 4 0
       strasbourg fleckenstein eth0 0 0 0 0
-- 
GitLab