Fixed merge conflicts

* ACE/tests/run_test.lst: * ACE/tests/tests.mpc:
DOCGroup · Mar 11, 2025 · b937df8 · b937df8
1 parent 17e5cdc
commit b937df8
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 22 deletions.
diff --git a/ACE/tests/run_test.lst b/ACE/tests/run_test.lst
@@ -109,12 +109,7 @@ Compiler_Features_35_Test
 Compiler_Features_36_Test
 Compiler_Features_37_Test
 Compiler_Features_38_Test
-<<<<<<< HEAD
-=======
-Compiler_Features_39_Test
-Compiler_Features_40_Test
 Compiler_Features_41_Test
->>>>>>> 7bb1334218 (New test for __try/__finally)
 Config_Test: !LynxOS !VxWorks !ACE_FOR_TAO
 Conn_Test: !ACE_FOR_TAO
 DLL_Test: !STATIC Linux

diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc
@@ -842,30 +842,13 @@ project(Compiler_Features_38_Test) : acetest {
   }
 }
 
-<<<<<<< HEAD
-=======
-project(Compiler_Features_39_Test) : acetest {
-  exename = Compiler_Features_39_Test
-  Source_Files {
-    Compiler_Features_39_Test.cpp
-  }
-}
-
-project(Compiler_Features_40_Test) : acetest {
-  exename = Compiler_Features_40_Test
-  Source_Files {
-    Compiler_Features_40_Test.cpp
-  }
-}
-
 project(Compiler_Features_41_Test) : acetest {
   exename = Compiler_Features_41_Test
   Source_Files {
     Compiler_Features_41_Test.cpp
   }
 }
 
->>>>>>> 7bb1334218 (New test for __try/__finally)
 project(Config Test) : acetest {
   avoids += ace_for_tao
   exename = Config_Test