瀏覽代碼

After rebase: fix build

Michał Zaremba 4 月之前
父節點
當前提交
f96f33ac3f
共有 1 個文件被更改,包括 0 次插入4 次删除
  1. 0 4
      lib/CMakeLists.txt

+ 0 - 4
lib/CMakeLists.txt

@@ -486,12 +486,8 @@ set(lib_MAIN_HEADERS
 	callback/GameRandomizer.h
 	callback/MapInfoCallback.h
 	callback/EditorCallback.h
-<<<<<<< HEAD
 	
 	campaign/CampaignBonus.h
-=======
-
->>>>>>> eeff61da6 (Integrate EditorCallback into mapeditor)
 	campaign/CampaignConstants.h
 	campaign/CampaignHandler.h
 	campaign/CampaignRegions.h