From ddef9d408685f73acd3678791b7b6da94862ab24 Mon Sep 17 00:00:00 2001
From: pengtao <pengtao@kingsome.cn>
Date: Fri, 23 Aug 2019 09:40:25 +0800
Subject: [PATCH] remove merge info

---
 ad_Readme.md | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/ad_Readme.md b/ad_Readme.md
index 4f46363..b7cda86 100644
--- a/ad_Readme.md
+++ b/ad_Readme.md
@@ -72,11 +72,7 @@ http://spread.kingsome.cn/webapp/index.php?c=Ops&a=getAdList&body={"gameid":"100
 
 ##### 接口地址
 
-<<<<<<< HEAD
 http://spread.kingsome.cn/webapp/index.php
-=======
-http://promotion.kingsome.cn/webapp/index.php
->>>>>>> 6e5b56e1f53a0da5d470390653689d7507b00dea
 
 ##### 返回格式：json
 
@@ -84,11 +80,7 @@ http://promotion.kingsome.cn/webapp/index.php
 
 ##### 请求示范
 
-<<<<<<< HEAD
 http://spread.kingsome.cn/webapp/index.php?c=Ops&a=upAdRecording&adid=1009
-=======
-http://promotion.kingsome.cn/webapp/index.php?c=Ops&a=upAdRecording&adid=1009
->>>>>>> 6e5b56e1f53a0da5d470390653689d7507b00dea
 
 ##### 请求参数说明
 
@@ -113,4 +105,4 @@ http://promotion.kingsome.cn/webapp/index.php?c=Ops&a=upAdRecording&adid=1009
     "errcode": 0,
     "errmsg": "",
     "message": "1002 incr success!"
-}
\ No newline at end of file
+}