fe / YOHOBUYPC · Commits

Go to a project

Authored by Rock Zhang
Commit 193110752fceb2141987e01c00b0ef1096f9e88b 2 parents 03ece32b 90c56c36

Merge branch 'develop' into test

Inline Side-by-side
Showing 1 changed file with 0 additions and 4 deletions
@@ -276,17 +276,13 @@ @@ -276,17 +276,13 @@
276 seajs.use('js/me/personal-details'); 276 seajs.use('js/me/personal-details');
277 </script> 277 </script>
278 {{/if}} 278 {{/if}}
279 -<<<<<<< HEAD  
280 {{#if browseRecordPage}} 279 {{#if browseRecordPage}}
281 <script> 280 <script>
282 seajs.use('js/me/browse-record'); 281 seajs.use('js/me/browse-record');
283 </script> 282 </script>
284 {{/if}} 283 {{/if}}
285 -=======  
286 {{#if logisticInfoPage}} 284 {{#if logisticInfoPage}}
287 <script> 285 <script>
288 seajs.use('js/me/logistic'); 286 seajs.use('js/me/logistic');
289 </script> 287 </script>
290 {{/if}} 288 {{/if}}
291 -  
292 ->>>>>>> feature/logistic