Remove git artifact

Signed-off-by: Caldeira, Quentin <[email protected]>
project-chip · Jun 28, 2024 · b607128 · b607128
1 parent e82693c
commit b607128
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/src/inet/BUILD.gn b/src/inet/BUILD.gn
@@ -162,15 +162,12 @@ static_library("inet") {
       "UDPEndPointImpl${chip_system_config_inet}.h",
       "UDPEndPointImpl.h",
     ]
-<<<<<<< HEAD
-=======
 
     if (chip_system_config_inet == "Sockets") {
       # TODO: dependency on this one is not clear as it is only ever
       #       enabled through CMakeLists.txt. Added here for completeness
       sources += [ "ZephyrSocket.h" ]
     }
->>>>>>> parent of f283940c03 (Remove ZephyrSocket)
   }
 
   if (chip_with_nlfaultinjection) {