Fix conflicts

RE-SS3D · Jun 30, 2024 · b616720 · b616720
1 parent 29f26df
commit b616720
Show file tree

Hide file tree

Showing 44 changed files with 560 additions and 1,120 deletions.
diff --git a/Assets/Scripts/Tests/Asset Audit.meta b/Assets/Scripts/Tests/Asset Audit.meta
diff --git a/Assets/Scripts/Tests/Asset Audit/SS3DRules.ruleset b/Assets/Scripts/Tests/Asset Audit/SS3DRules.ruleset
diff --git a/Assets/Scripts/Tests/Asset Audit/SS3DRules.ruleset.meta b/Assets/Scripts/Tests/Asset Audit/SS3DRules.ruleset.meta
diff --git a/.../Tests/Asset Audit/AssetAuditUtilities.cs → ...s/Tests/AssetAudit/AssetAuditUtilities.cs b/.../Tests/Asset Audit/AssetAuditUtilities.cs → ...s/Tests/AssetAudit/AssetAuditUtilities.cs
diff --git a/...s/Asset Audit/AssetAuditUtilities.cs.meta → ...ts/AssetAudit/AssetAuditUtilities.cs.meta b/...s/Asset Audit/AssetAuditUtilities.cs.meta → ...ts/AssetAudit/AssetAuditUtilities.cs.meta
diff --git a/...ripts/Tests/Asset Audit/AssetDataTests.cs → ...cripts/Tests/AssetAudit/AssetDataTests.cs b/...ripts/Tests/Asset Audit/AssetDataTests.cs → ...cripts/Tests/AssetAudit/AssetDataTests.cs
diff --git a/.../Tests/Asset Audit/AssetDataTests.cs.meta → ...s/Tests/AssetAudit/AssetDataTests.cs.meta b/.../Tests/Asset Audit/AssetDataTests.cs.meta → ...s/Tests/AssetAudit/AssetDataTests.cs.meta
diff --git a/.../Scripts/Tests/Asset Audit/PrefabTests.cs → ...s/Scripts/Tests/AssetAudit/PrefabTests.cs b/.../Scripts/Tests/Asset Audit/PrefabTests.cs → ...s/Scripts/Tests/AssetAudit/PrefabTests.cs
diff --git a/...pts/Tests/Asset Audit/PrefabTests.cs.meta → ...ipts/Tests/AssetAudit/PrefabTests.cs.meta b/...pts/Tests/Asset Audit/PrefabTests.cs.meta → ...ipts/Tests/AssetAudit/PrefabTests.cs.meta
diff --git a/...ts/Asset Audit/SS3D.Tests.EditMode.asmdef → ...sts/AssetAudit/SS3D.Tests.EditMode.asmdef b/...ts/Asset Audit/SS3D.Tests.EditMode.asmdef → ...sts/AssetAudit/SS3D.Tests.EditMode.asmdef
diff --git a/...set Audit/SS3D.Tests.EditMode.asmdef.meta → ...ssetAudit/SS3D.Tests.EditMode.asmdef.meta b/...set Audit/SS3D.Tests.EditMode.asmdef.meta → ...ssetAudit/SS3D.Tests.EditMode.asmdef.meta