Commits

Andrew Gough committed 246f036

Resolved test conflict

  • Participants
  • Parent commits 2ed662a

Comments (0)

Files changed (1)

tests/premake4.lua

 	dofile("base/test_path.lua")
 	dofile("base/test_table.lua")
 	dofile("base/test_tree.lua")
-<<<<<<< local
 	dofile("tools/test_gcc.lua")
 	dofile("tools/test_dmd.lua")
 	dofile("tools/test_gdc.lua")
 	dofile("tools/test_ldc.lua")
-=======
->>>>>>> other
 	dofile("base/test_config_bug.lua")
 
 	-- Solution object tests
 	dofile("actions/codeblocks/test_filters.lua")
 	dofile("actions/codeblocks/environment_variables.lua")
 
-<<<<<<< local
-    --dofile( "../monkeypatchd.lua" )
-=======
-
->>>>>>> other
 --
 -- Register a test action
 --