update

zmofei · Aug 5, 2016 · a91c261 · a91c261
2 parents 2545228 + ae4eb6b
commit a91c261
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 normalize.sass
 node_modules
 .sass-cache
@@ -9,3 +10,6 @@ static/upload/
 bower_components
 build
 .DS_Store
+=======
+node_models
+>>>>>>> ae4eb6b94fe57647b5266349b48f396603b6c1d1
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "dufing",
-  "version": "1.0.12",
+  "version": "1.0.13",
   "description": "The folder based webserver for node",
   "main": "index.js",
   "directories": {