mirror of
https://github.com/vcmi/vcmi.git
synced 2025-11-29 23:07:48 +02:00
After rebase: fix build
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user