Merge pull request #84 from ToniMacaroni/development

Development
ToniMacaroni · Sep 25, 2021 · b253b7a · b253b7a
2 parents 8cc5240 + 4e87b1d
commit b253b7a
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 39 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,8 @@
 ##
 ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
 
+.idea
+
 # User-specific files
 *.rsuser
 *.suo

diff --git a/.idea/.idea.SaberFactory/.idea/.gitignore b/.idea/.idea.SaberFactory/.idea/.gitignore
diff --git a/.idea/.idea.SaberFactory/.idea/codeStyles/codeStyleConfig.xml b/.idea/.idea.SaberFactory/.idea/codeStyles/codeStyleConfig.xml
diff --git a/.idea/.idea.SaberFactory/.idea/dictionaries/Julian.xml b/.idea/.idea.SaberFactory/.idea/dictionaries/Julian.xml
diff --git a/.idea/.idea.SaberFactory/.idea/encodings.xml b/.idea/.idea.SaberFactory/.idea/encodings.xml
diff --git a/.idea/.idea.SaberFactory/.idea/indexLayout.xml b/.idea/.idea.SaberFactory/.idea/indexLayout.xml
diff --git a/.idea/.idea.SaberFactory/.idea/vcs.xml b/.idea/.idea.SaberFactory/.idea/vcs.xml
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,6 +3,8 @@ @@
     ##
     ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+    .idea
     # User-specific files
     *.rsuser
     *.suo
@@ Expand Down @@