no message

9b1f86c8 · maxiaoliang · 28a610b8 · 9b1f86c8
Commit 9b1f86c8 authored May 14, 2021 by maxiaoliang
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

CrazyCar.unity Assets/Game/Main/Scenes/CrazyCar.unity +0 -5

No files found.
--- a/Assets/Game/Main/Scenes/CrazyCar.unity
+++ b/Assets/Game/Main/Scenes/CrazyCar.unity
@@ -2415,13 +2415,8 @@ MonoBehaviour:
  DriverTimerTV: {fileID: 242298058}
  DoubleTimerTV: {fileID: 1465665560}
  AllSpeedTimerTV: {fileID: 1077363537}
-
  procetTimeObj: {fileID: 0}
  EveryDayWithDraw: {fileID: 0}
-=======
-  procetTimeObj: {fileID: 70009392}
-  EveryDayWithDraw: {fileID: 1309034794}
->>>>>>> .merge_file_a01424
 --- !u!1 &107878020
 GameObject:
  m_ObjectHideFlags: 0