2
0

2 Commity e095493a0e ... 81a2c281ee

Autor SHA1 Správa Dátum
  Syed zainul abedin 81a2c281ee Merge branch 'merge-test' of http://106.51.72.251:3000/Terra/new-git into merge-test 1 mesiac pred
  Syed zainul abedin f07474f921 Updated conflict watcher 1 mesiac pred
1 zmenil súbory, kde vykonal 1 pridanie a 1 odobranie
  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;