diff --git a/campaign/event_20201126_cn/campaign_base.py b/campaign/event_20201126_cn/campaign_base.py index ce041508e..0df7d8895 100644 --- a/campaign/event_20201126_cn/campaign_base.py +++ b/campaign/event_20201126_cn/campaign_base.py @@ -3,11 +3,7 @@ from module.campaign.assets import EVENT_20201126_ENTRANCE_TEMP, EVENT_20201126_ from module.campaign.campaign_base import CampaignBase as CampaignBase_ from module.exception import CampaignNameError from module.logger import logger -<<<<<<< HEAD -from module.ui.page import page_campaign_menu, page_event, page_main_white -======= from module.ui.page import page_campaign_menu, page_event, page_main ->>>>>>> pr5625 EVENT_ANIMATION = Button(area=(49, 229, 119, 400), color=(118, 215, 240), button=(49, 229, 119, 400), name='EVENT_ANIMATION')