Resolve merge conflict

ngageoint · Mar 2, 2020 · 197ce05 · 197ce05
1 parent 546e622
commit 197ce05
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/modules/c/nitf/CMakeLists.txt b/modules/c/nitf/CMakeLists.txt
@@ -161,12 +161,8 @@ set(tre_srcs  ACCHZB
 
 foreach(tre ${tre_srcs})
     add_library(${tre} SHARED shared/${tre}.c)
-<<<<<<< HEAD
-    target_link_libraries(${tre} nitf-c)
-=======
     target_link_libraries(${tre} nitf)
     target_compile_definitions(${tre} PRIVATE NITF_MODULE_EXPORTS)
->>>>>>> master
 
     # This line is making sure the resultant TRE is named, e.g.
     # XML_DATA_CONTENT.so instead of libXML_DATA_CONTENT.so