SHA1
--- a/Assets/GitMerge/Editor/ConflictWatcher.cs
+++ b/Assets/GitMerge/Editor/ConflictWatcher.cs
@@ -1,4 +1,4 @@
 
				-// using System;
			
 
				+using System;
			
 
				 // using System.Collections.Generic;
			
 
				 // using System.IO;
			
 
				 // using UnityEditor;
作者	SHA1 备注	提交日期
Syed zainul abedin	81a2c281ee Merge branch 'merge-test' of http://106.51.72.251:3000/Terra/new-git into merge-test	1 月之前
Syed zainul abedin	f07474f921 Updated conflict watcher	1 月之前