123

assets/script/game/game.ts

@@ -19,11 +19,9 @@ import { count_time_start } from './count_time_start';
 import { weiqi_manager } from './effect/weiqi_manager';
 import { cheyin_manager } from './cheyin/cheyin_manager';
 import { boom_manager } from './boom/boom_manager';
-<<<<<<< HEAD
 import { qiyou_manager } from './qiyou_manager';
-=======
+
 import { SdkUtil } from '../sdkUtil';
->>>>>>> d9a6c0f9d58deea8f186748c34007b4ea38b64af
 const { ccclass, property } = _decorator;
 
 @ccclass('game')