From 8535440f6bebdf785683b4a62073f9465ca7e9cc Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal@nekernel.org>
Date: Mon, 17 Nov 2025 10:33:21 +0100
Subject: fix: fixing merge conflicts.

Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
---
 dev/lib/core/allocator_system.hpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dev/lib/core')

diff --git a/dev/lib/core/allocator_system.hpp b/dev/lib/core/allocator_system.hpp
index 6fd0119..1873064 100644
--- a/dev/lib/core/allocator_system.hpp
+++ b/dev/lib/core/allocator_system.hpp
@@ -71,4 +71,4 @@ namespace ocl
 	using standard_allocator_type = allocator_system<type, new_op<type>, delete_op<type>>;
 } // namespace ocl
 
-#endif // ifndef _OCL_ALLOCATOR_SYSTEM_HPP
+#endif // ifndef _OCL_ALLOCATOR_SYSTEM_HPP
\ No newline at end of file
-- 
cgit v1.2.3