|
@@ -253,9 +253,9 @@ namespace GitMerge
|
|
{
|
|
{
|
|
var assetType = asset.GetType();
|
|
var assetType = asset.GetType();
|
|
return assetType == typeof(GameObject) ||
|
|
return assetType == typeof(GameObject) ||
|
|
-#if UNITY_2022_3_OR_NEWER
|
|
|
|
- assetType == typeof(BrokenPrefabAsset) ||
|
|
|
|
-#endif
|
|
|
|
|
|
+// #if UNITY_2022_3_OR_NEWER
|
|
|
|
+// assetType == typeof(BrokenPrefabAsset) ||
|
|
|
|
+// #endif
|
|
assetType == typeof(DefaultAsset);
|
|
assetType == typeof(DefaultAsset);
|
|
}
|
|
}
|
|
|
|
|