fe / yoho-blk · Commits

Go to a project

Authored by 姜枫
Commit b3401f7fa31d6f3b582cf258534c77f1f46b2cb8 1 parent 90ae968d

fix merge

Inline Side-by-side
Showing 1 changed file with 0 additions and 5 deletions
@@ -52,11 +52,6 @@ const _processListData = (list) => { @@ -52,11 +52,6 @@ const _processListData = (list) => {
52 52
53 }); 53 });
54 listData.tabs = list.list.artList; 54 listData.tabs = list.list.artList;
55 -<<<<<<< HEAD  
56 -=======  
57 -  
58 - // console.log(listData)  
59 ->>>>>>> b71856c69f68002ad697169e8d8f4447ad195e4a  
60 55
61 return listData; 56 return listData;
62 }; 57 };