Updated gitignore.

strongwazz · Apr 7, 2013 · b83a181 · b83a181
1 parent bfa1401
commit b83a181
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,18 +7,10 @@ ssl
 
 nbproject
 
-# Ignore config file w/ sensitive information
-config/db.js
-
-# Ignore dev minified/compiled assets
-public/stylesheets/_*.css
-public/js/_*.js
-
-# Ignore production minified/compiled assets
-public/_target/*.js
-public/_target/*.css
+# Ignore temporary files
+.tmp
 
 *.swo
 *.swp
 *.swn
-*.swm
+*.swm
diff --git a/test/waterline/fixtures/collections/User.js b/test/waterline/fixtures/collections/User.js
@@ -67,7 +67,7 @@ exports.identity = 'User';
 // development: temporal (in-memory dirtydb)
 ////////////////////////////////////////////////////////
 // exports.adapter = 'sails-dirty';
-// exports.inMemory = true;
+// exports.inMemory = false;
 
 ////////////////////////////////////////////////////////
 // mySQL