Revert "del: 从git版本中删掉server.json"

This reverts commit d38b1a9.
xiongwilee · Apr 13, 2017 · a29ce9b · a29ce9b
1 parent d38b1a9
commit a29ce9b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
-/config/server.json
+config/server.json
 
 /node_modules
 npm-debug.*
-.DS_Store
+.DS_Store
diff --git a/config/server.json b/config/server.json
@@ -0,0 +1,3 @@
+{
+  "merge": {}
+}