|
@@ -37,7 +37,6 @@ namespace GitMerge
|
|
var path = e.FullPath;
|
|
var path = e.FullPath;
|
|
var relativePath = "Assets" + path.Substring(Application.dataPath.Length);
|
|
var relativePath = "Assets" + path.Substring(Application.dataPath.Length);
|
|
|
|
|
|
- Debug.Log(relativePath);
|
|
|
|
if (!path.EndsWith(".unity") && !path.EndsWith(".prefab")) return;
|
|
if (!path.EndsWith(".unity") && !path.EndsWith(".prefab")) return;
|
|
// Found it
|
|
// Found it
|
|
UnityEngine.Object asset;
|
|
UnityEngine.Object asset;
|