Remove git artifact

QuentinCaldeira-eaton · QuentinCaldeira-eaton · commit b607128fe9ba · 2024-06-28T15:33:42.000+02:00
Signed-off-by: Caldeira, Quentin &lt;QuentinCaldeira@eaton.com&gt;
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) {

Original file line number	Diff line number	Diff line change
`@@ -162,15 +162,12 @@ static_library("inet") {`
`162`	`162`	`"UDPEndPointImpl${chip_system_config_inet}.h",`
`163`	`163`	`"UDPEndPointImpl.h",`
`164`	`164`	`]`
`165`		`-<<<<<<< HEAD`
`166`		`-=======`
`167`	`165`
`168`	`166`	`if (chip_system_config_inet == "Sockets") {`
`169`	`167`	`# TODO: dependency on this one is not clear as it is only ever`
`170`	`168`	`# enabled through CMakeLists.txt. Added here for completeness`
`171`	`169`	`sources += [ "ZephyrSocket.h" ]`
`172`	`170`	`}`
`173`		`->>>>>>> parent of f283940c03 (Remove ZephyrSocket)`
`174`	`171`	`}`
`175`	`172`
`176`	`173`	`if (chip_with_nlfaultinjection) {`