From b27558e81b76ab3f03f801721251174cee068bbe Mon Sep 17 00:00:00 2001
From: cmoineau <cyril.moineau@cea.fr>
Date: Thu, 20 Feb 2025 08:15:27 +0000
Subject: [PATCH] Remove merge conflict artifact.

---
 include/aidge/operator/AvgPooling.hpp | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/include/aidge/operator/AvgPooling.hpp b/include/aidge/operator/AvgPooling.hpp
index 367435fe7..6022d6a2a 100644
--- a/include/aidge/operator/AvgPooling.hpp
+++ b/include/aidge/operator/AvgPooling.hpp
@@ -290,9 +290,4 @@ extern template class Aidge::AvgPooling_Op<2>;
 extern template class Aidge::AvgPooling_Op<3>;
 extern template class Aidge::AvgPooling_Op<4>;
 
-<<<<<<< HEAD
-=======
-
->>>>>>> 9b3579590d612d89cd36f42d47bb396670ef14af
-
 #endif /* AIDGE_CORE_OPERATOR_AVGPOOLING_H_ */
-- 
GitLab