冲突解决

9b966c69 · wangshuo · a2f4b232 · 9b966c69
Commit 9b966c69 authored Jul 23, 2019 by wangshuo
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

src/utils/http.js
+0 -3

No files found.
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -2,10 +2,7 @@ import axios from "axios";
 import qs from 'qs'
 axios.defaults.headers.post['Content-Type'] = 'application/x-www-form-urlencoded';
-<<<<<<< HEAD
-=======
 axios.defaults.withCredentials = true
->>>>>>> 7d149ab14ab8e5a92ebc33f45dcdae034f012028
 const instance = axios.create({
    transformRequest: [