From a1f0653ec48d7787e0d57cabef0600b2a07355eb Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Sat, 31 Oct 2020 17:03:14 +0800
Subject: [PATCH] 解决冲突
---
Assets/Scripts/Common/CommonDebugHelper.cs | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/Assets/Scripts/Common/CommonDebugHelper.cs b/Assets/Scripts/Common/CommonDebugHelper.cs
index 692596e..580e072 100644
--- a/Assets/Scripts/Common/CommonDebugHelper.cs
+++ b/Assets/Scripts/Common/CommonDebugHelper.cs
@@ -155,7 +155,6 @@
break;
}
//UIManager.Instance.ShowWarningWind(log);
-
}
}
}
--
Gitblit v1.9.1