From: mlaurent <mathieu.laurent@ens-rennes.fr>
Date: Tue, 7 Nov 2023 12:20:10 +0000 (+0100)
Subject: Merge branch 'master' of https://framagit.org/simgrid/simgrid
X-Git-Tag: v3.35~89
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/fa33c62c831c17237ac38960b24596560ad3804d

Merge branch 'master' of https://framagit.org/simgrid/simgrid
---

fa33c62c831c17237ac38960b24596560ad3804d
diff --cc src/mc/transition/TransitionSynchro.cpp
index 21ea4ec8af,5e7ded2aed..bd5788665a
--- a/src/mc/transition/TransitionSynchro.cpp
+++ b/src/mc/transition/TransitionSynchro.cpp
@@@ -128,7 -128,7 +128,11 @@@ bool SemaphoreTransition::depends(cons
    // Actions executed by the same actor are always dependent
    if (o->aid_ == aid_)
      return true;
++<<<<<<< HEAD
 +  
++=======
+ 
++>>>>>>> dfafe652e9ae62c35cd0fc084b117fc987b3e8dc
    if (const auto* other = dynamic_cast<const SemaphoreTransition*>(o)) {
      if (sem_ != other->sem_)
        return false;