2 Komitmen e095493a0e ... 81a2c281ee

Pembuat SHA1 Pesan Tanggal
  Syed zainul abedin 81a2c281ee Merge branch 'merge-test' of http://106.51.72.251:3000/Terra/new-git into merge-test 1 bulan lalu
  Syed zainul abedin f07474f921 Updated conflict watcher 1 bulan lalu
1 mengubah file dengan 1 tambahan dan 1 penghapusan
  1. 1 1
      Assets/GitMerge/Editor/ConflictWatcher.cs

+ 1 - 1
Assets/GitMerge/Editor/ConflictWatcher.cs

@@ -1,4 +1,4 @@
-// using System;
+using System;
 // using System.Collections.Generic;
 // using System.IO;
 // using UnityEditor;