fe / YOHO-ACTIVITY-PHP · Commits

Go to a project

Authored by 梁志锋
Commit ddb7308be4b32098a4cdac209b370ab6d9b54d8c 1 parent 7baa83d3

resolve code conflict

Inline Side-by-side
Showing 1 changed file with 0 additions and 8 deletions
@@ -28,15 +28,7 @@ @@ -28,15 +28,7 @@
28 a.async=1; 28 a.async=1;
29 a.src=j; 29 a.src=j;
30 m.parentNode.insertBefore(a,m); 30 m.parentNode.insertBefore(a,m);
31 -<<<<<<< HEAD  
32 -<<<<<<< HEAD  
33 - })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.13.2/yas.js','_yas');  
34 -=======  
35 })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/{{yas_version}}/yas.js','_yas'); 31 })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/{{yas_version}}/yas.js','_yas');
36 ->>>>>>> 3685878e28b5f0a7fbf2ebdb250a96a5ecc47f52  
37 -=======  
38 - })(window,document,'script','http://cdn.yoho.cn/yas-jssdk/1.0.13.2/yas.js','_yas');  
39 ->>>>>>> 70676b75c6237c141c6f2f4e47518bcd80ea47d8  
40 </script> 32 </script>
41 {{> layout/use}} 33 {{> layout/use}}
42 {{> layout/analysis}} 34 {{> layout/analysis}}