2:01

Assets/Game/Main/Scenes/CrazyCar.unity

@@ -2415,22 +2415,7 @@ MonoBehaviour:
   DriverTimerTV: {fileID: 242298058}
   DoubleTimerTV: {fileID: 1465665560}
   AllSpeedTimerTV: {fileID: 1077363537}
-<<<<<<< .merge_file_a09900
-  proTimerTv: {fileID: 0}
-=======
-  proTimerTv: {fileID: 70009395}
->>>>>>> .merge_file_a01424
-  StickTimerObj: {fileID: 694002146}
-  StickObj: {fileID: 1183343286}
-  MyDriverTimerObj: {fileID: 1507646506}
-  MyDriverObj: {fileID: 923216953}
-  DoubleTimerObj: {fileID: 1465665558}
-  DoubleObj: {fileID: 606793024}
-  tvrewardCoinEveryMinute: {fileID: 30418249}
-  tvrewardCashEveryMinute: {fileID: 154543858}
-  cashNumTv: {fileID: 0}
-  levelTv: {fileID: 920415600}
-<<<<<<< .merge_file_a09900
+
   procetTimeObj: {fileID: 0}
   EveryDayWithDraw: {fileID: 0}
 =======
@@ -26811,11 +26796,7 @@ MonoBehaviour:
   btnSpriteArray:
   - {fileID: 21300000, guid: 1ae98da985892404880d686e6d442c1d, type: 3}
   - {fileID: 21300000, guid: 1ae98da985892404880d686e6d442c1d, type: 3}
-<<<<<<< .merge_file_a09900
-  withdrawpage: {fileID: 0}
-=======
-  withdrawpage: {fileID: 1309034794}
->>>>>>> .merge_file_a01424
+
 --- !u!1 &1316945478
 GameObject:
   m_ObjectHideFlags: 0