冲突解决

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: [