merge config.json

NodeLab · Sep 22, 2014 · 5a04177 · 5a04177
1 parent 4f046de
commit 5a04177
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/config.json b/config.json
@@ -9,15 +9,13 @@
     "deployPath": "70s/1406-1/",
     "prizeSwitch": 1,
     "ajaxList": {
-<<<<<<< HEAD
         "/prize/ajax/prizeDraw?groupId=198": {
             "code": 200,
             "msg": {}
-=======
+            },
         "/test": {
             "code": 200,
             "msg": "hello world!"
->>>>>>> 7683750a61101abea495ce6a6df4584196d18992
         }
     }
 }