From f476126677a6f6bde34fed232c415e6889eec74d Mon Sep 17 00:00:00 2001
From: louis <louiscaesapdf@gmail.com>
Date: Sat, 11 May 2024 12:09:50 +0700
Subject: [PATCH] fix conflicts
---
.vscode/settings.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index daa9bf8f..b2449923 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -51,5 +51,5 @@
"temp/": true,
"Temp/": true
},
- "dotnet.defaultSolution": "GamePBD.sln"
+ "dotnet.defaultSolution": "if3210-2024-unity-ngk.sln"
}
\ No newline at end of file
--
GitLab