删除注释

01008-获取语音url-chat_voice_url.robot

@@ -12,11 +12,6 @@ ${path}           /api/chat/voice-url
     ${content}    GET请求结果    ${path}    {}    200    ${token}
     log    ${content}
     Should Be Equal As Strings    ${content["code"]}    200
-<<<<<<< .mine
-    Comment    Should Contain    ${content["data"]}    https://iat-api.xfyun.cn
-=======
-
->>>>>>> .theirs
 
 反例-不传入token
     [Tags]    E