init

ChameleonO2 · ChameleonO2 · commit 49441219e04f · 2020-07-12T19:13:31.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -18,12 +18,15 @@
 
 # Autogenerated Jetbrains Rider plugin
 [Aa]ssets/Plugins/Editor/JetBrains*
->>>>>>> origin/master
 
 # Visual Studio cache directory
 .vs/
 .vscode/
 
+# Visual Studio cache directory
+.vs/
+>>>>>>> origin/master
+
 # Gradle cache directory
 .gradle/
 
