From 5a04177c4651b66e873c9957c2888b2e57dd80b3 Mon Sep 17 00:00:00 2001
From: Arvo <ArvoGuo@gmail.com>
Date: Mon, 22 Sep 2014 23:16:36 +0800
Subject: [PATCH] merge config.json

---
 config.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/config.json b/config.json
index e03c3d0..d8304ad 100644
--- 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
         }
     }
 }
\ No newline at end of file