From 3827ae4e821ff3758d1eaf2dbacc55a22f802731 Mon Sep 17 00:00:00 2001
From: Amlal El Mahrouss <amlal@nekernel.org>
Date: Mon, 17 Nov 2025 10:31:30 +0100
Subject: feat: fixing merge conflicts.

Signed-off-by: Amlal El Mahrouss <amlal@nekernel.org>
---
 dev/lib/memory/tracked_ptr.hpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'dev/lib/memory')

diff --git a/dev/lib/memory/tracked_ptr.hpp b/dev/lib/memory/tracked_ptr.hpp
index eb33bd0..d2f8450 100644
--- a/dev/lib/memory/tracked_ptr.hpp
+++ b/dev/lib/memory/tracked_ptr.hpp
@@ -16,7 +16,7 @@
 #include <unistd.h>
 #include <signal.h>
 
-namespace scl::memory
+namespace ocl::memory
 {
 	template <typename T>
 	class tracked_allocator;
@@ -232,4 +232,4 @@ namespace scl::memory
 			::kill(::getpid(), SIGTRAP);
 		}
 	}
-} // namespace scl::memory
+} // namespace ocl::memory
-- 
cgit v1.2.3