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/fix/fix.hpp | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'dev/lib/fix')

diff --git a/dev/lib/fix/fix.hpp b/dev/lib/fix/fix.hpp
index 672b8a1..243d01c 100644
--- a/dev/lib/fix/fix.hpp
+++ b/dev/lib/fix/fix.hpp
@@ -5,8 +5,8 @@
  * Copyright 2025, Amlal El Mahrouss 
  */
 
-#ifndef _SCL_FIX_PARSER_HPP
-#define _SCL_FIX_PARSER_HPP
+#ifndef _OCL_FIX_PARSER_HPP
+#define _OCL_FIX_PARSER_HPP
 
 #include <cstddef>
 #include <cassert>
@@ -17,7 +17,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-namespace scl::fix
+namespace ocl::fix
 {
 	template <typename char_type>
 	class basic_visitor;
@@ -210,6 +210,6 @@ namespace scl::fix
 	}
 
 	using fix_tag_type = std::uint32_t;
-} // namespace scl::fix
+} // namespace ocl::fix
 
-#endif // ifndef _SCL_FIX_PARSER_HPP
+#endif // ifndef _OCL_FIX_PARSER_HPP
-- 
cgit v1.2.3