Skip to content
Snippets Groups Projects
Commit 27aa855c authored by Cyril Moineau's avatar Cyril Moineau
Browse files

Fix merge conflict artifact.

parent c82911a5
No related branches found
No related tags found
1 merge request!297Reshape forward dims
Pipeline #67201 passed
...@@ -507,11 +507,7 @@ private: ...@@ -507,11 +507,7 @@ private:
* @param outId * @param outId
* @param otherInId * @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 * @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. * possible dangling connection situations in debug using ref counting.
*/ */
void addChildOp(const NodePtr& otherNode, const IOIndex_t outId, void addChildOp(const NodePtr& otherNode, const IOIndex_t outId,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment