修复merge导致的bug

@@ -43,13 +43,10 @@ $searchBox.children('.search-icon').on('touchstart', function() {
     $indexSearch.submit();
 });
 
-<<<<<<< HEAD
 $('.index-channel img').on('load error', function() {
     window.rePosFooter && window.rePosFooter();
 });
 
-=======
->>>>>>> 39d64e4563c087639080da0a3a7d4f28c38e2b34
 $channelLink.on('touchstart', function() {
     $channelLink.css({
         background: '#000',
@@ -67,11 +64,4 @@ $channelLink.on('touchstart', function() {
         color: '#fff',
         borderColor: '#fff'
     });
-<<<<<<< HEAD
-=======
-});
-
-$('.index-channel img').on('load error', function() {
-    window.rePosFooter && window.rePosFooter();
->>>>>>> 39d64e4563c087639080da0a3a7d4f28c38e2b34
 });