ignore

lorddev · Apr 3, 2017 · 935597c · 935597c
1 parent 9ac01a3
commit 935597c
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -28,8 +28,6 @@ local.properties
 # PDT-specific
 .buildpath
 
-node_modules/
-
 #################
 ## Visual Studio
 #################
@@ -116,7 +114,6 @@ Backup*/
 UpgradeLog*.XML
 
 
-
 ############
 ## Windows
 ############
@@ -163,5 +160,14 @@ pip-log.txt
 # Mac crap
 .DS_Store
 
+#################
+# Custom
+#################
+
+.vs/*
+
+# Created by mergetool
+*.orig
+
 # Ignore node thingy
-node_modules
+node_modules/