From 1345537486abcb374be6a4e5e4f7ffa45dc2b862 Mon Sep 17 00:00:00 2001
From: GolfOcean334 <130740013+GolfOcean334@users.noreply.github.com>
Date: Thu, 11 Apr 2024 09:19:20 +0200
Subject: [PATCH] Fix merge
---
enginecustom/enginecustom.vcxproj | 3 +-
enginecustom/enginecustom.vcxproj.filters | 100 +++++++---------------
2 files changed, 32 insertions(+), 71 deletions(-)
diff --git a/enginecustom/enginecustom.vcxproj b/enginecustom/enginecustom.vcxproj
index 7eb8b74..868cc9b 100644
--- a/enginecustom/enginecustom.vcxproj
+++ b/enginecustom/enginecustom.vcxproj
@@ -188,7 +188,6 @@
-
@@ -206,10 +205,10 @@
-
+
diff --git a/enginecustom/enginecustom.vcxproj.filters b/enginecustom/enginecustom.vcxproj.filters
index 46ace05..05baaa3 100644
--- a/enginecustom/enginecustom.vcxproj.filters
+++ b/enginecustom/enginecustom.vcxproj.filters
@@ -307,81 +307,15 @@
assets
-
- assets
-
-
- assets
-
assets
-
- assets
-
-
- assets
-
-
- Assets
-
Assets
-
-
-
-
- shader
-
-
- shader
-
-
- shader
-
-
- shader
-
-
- texture
-
-
- texture
-
-
- shader
-
-
- shader
-
-
- Texture
-
-
- Texture
-
-
- Texture
-
-
- Texture
-
-
- shader
-
-
- shader
-
-
-
-
-
-
-
@@ -390,6 +324,9 @@
assets
+
+ Assets
+
@@ -424,11 +361,36 @@
Assets
-
- Assets
-
Assets
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file