From 438823d573a1962d1830c46643dee6b533bb7d08 Mon Sep 17 00:00:00 2001
From: ms245755 <michal.szczepanski@cea.fr>
Date: Thu, 6 Jun 2024 13:15:44 +0000
Subject: [PATCH] included added

---
 include/aidge/backend/cpu.hpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/include/aidge/backend/cpu.hpp b/include/aidge/backend/cpu.hpp
index 49c50ba9..d4689a28 100644
--- a/include/aidge/backend/cpu.hpp
+++ b/include/aidge/backend/cpu.hpp
@@ -32,11 +32,7 @@
 #include "aidge/backend/cpu/operator/ResizeImpl.hpp"
 #include "aidge/backend/cpu/operator/ScalingImpl.hpp"
 #include "aidge/backend/cpu/operator/SigmoidImpl.hpp"
-<<<<<<< HEAD
-=======
-#include "aidge/backend/cpu/operator/SqrtImpl.hpp"
 #include "aidge/backend/cpu/operator/SliceImpl.hpp"
->>>>>>> 179480936392d229791336bd1fc58506a06aaf29
 #include "aidge/backend/cpu/operator/SoftmaxImpl.hpp"
 #include "aidge/backend/cpu/operator/SqrtImpl.hpp"
 #include "aidge/backend/cpu/operator/SubImpl.hpp"
-- 
GitLab