From 27aa855cafb671fdab264a2a54dae02a522b0b2c Mon Sep 17 00:00:00 2001
From: cmoineau <cyril.moineau@cea.fr>
Date: Tue, 4 Mar 2025 21:27:22 +0000
Subject: [PATCH] Fix merge conflict artifact.
---
include/aidge/graph/Node.hpp | 4 ----
1 file changed, 4 deletions(-)
diff --git a/include/aidge/graph/Node.hpp b/include/aidge/graph/Node.hpp
index 15d8aaf4e..cd2ca38df 100644
--- a/include/aidge/graph/Node.hpp
+++ b/include/aidge/graph/Node.hpp
@@ -507,11 +507,7 @@ private:
* @param outId
* @param otherInId
*
-<<<<<<< HEAD
- * @note otherNode shared_ptr is passed by refenrece in order to be able to detect
-=======
* @note otherNode shared_ptr is passed by reference in order to be able to detect
->>>>>>> 3a88aa7d (Update some log messages and fix small typo in Node.hpp)
* possible dangling connection situations in debug using ref counting.
*/
void addChildOp(const NodePtr& otherNode, const IOIndex_t outId,
--
GitLab