conflict

@@ -132,11 +132,6 @@ router.get('/installment/card-detail', installment.cardDetail); // 银行å¡è¯¦æ
 router.get('/installment/delBankCard', installment.delBankCard); // 删除绑定
 router.get('/installment/setMasterCard', installment.setMasterCard); // 切换主卡
 
-<<<<<<< HEAD
-router.get('/recommend-for-you/userCenter', recommendForYou.userCenter);// 为你优选
-
 router.get('/address-vact', addressController.addressActVue); // 地址添加页面
 
-=======
->>>>>>> master
 module.exports = router;