diff --git a/src/common/common.ts b/src/common/common.ts
index ef93cee..e2ba671 100644
--- a/src/common/common.ts
+++ b/src/common/common.ts
@@ -23,7 +23,6 @@ export const goLink = (path = '', params = {}, type:false|true = false) => {
     }
   
 }
-<<<<<<< HEAD
 /**
  * 判断对象为空
  * @param object 
@@ -88,7 +87,6 @@ export const retrieval = (data: any, message: string="请填写完信息", rules
       resolve(null);
     })
   }
-=======
 
 // 金额千位分割符
 export const formatKbPrice = (number: string) => {
@@ -102,4 +100,3 @@ export const formatKbPrice = (number: string) => {
     },[])
     return ret.reverse().join('');
 }
->>>>>>> 1557571 (确认订单)