解决冲突

common/tools.py

+def sheep():
+    pass
\ No newline at end of file

common/utils.py

@@ -12,4 +12,3 @@ def dingTalk(webhook, message):
     post_data = json.dumps(data)
     post_data = json.dumps(data)
     response = requests.post(webhook, headers=BaseConfig.headers, data=post_data)
     response = requests.post(webhook, headers=BaseConfig.headers, data=post_data)
     return response.text
     return response.text
-