Merge "Yangman - Deselect history requests"

[dlux.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index b34b2a91753b72234b4bb60c3c9e1ce9b9691d45..71fd842ffab627206259b96860ee6b8d18202eab 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 *.sw*
 *~
-assets/
+# assets/
+dlux-web/**/assets/
 build/
 bin/
 node_modules/
@@ -8,6 +9,10 @@ target/
 vendor/
 .DS_Store
 
+# dlux app
+dlux-web/src/
+!dlux-web/src/less/
+
 # Eclipse
 .classpath
 .project
@@ -33,4 +38,6 @@ target/
 *.ear
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
\ No newline at end of file
+hs_err_pid*
+dlux-web/node
+dlux-web/src/LICENSE