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/tests/network_basic/net_test.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'dev/tests/network_basic')

diff --git a/dev/tests/network_basic/net_test.cc b/dev/tests/network_basic/net_test.cc
index 4bd3a9f..61d0b28 100644
--- a/dev/tests/network_basic/net_test.cc
+++ b/dev/tests/network_basic/net_test.cc
@@ -12,8 +12,8 @@
 
 TEST(NetworkTest, BasicNetworkUsage)
 {
-	scl::net::basic_modem modem;
-	modem.construct<AF_INET, SOCK_STREAM, 8000>(scl::net::basic_modem::local_address_ip4, true);
+	ocl::net::basic_modem modem;
+	modem.construct<AF_INET, SOCK_STREAM, 8000>(ocl::net::basic_modem::local_address_ip4, true);
 
 	EXPECT_TRUE(modem.is_valid());
 
-- 
cgit v1.2.3