diff --git a/src/system/taglib/channel/softlinks.lib.php b/src/system/taglib/channel/softlinks.lib.php
index c2eb1c0b..37142c63 100755
--- a/src/system/taglib/channel/softlinks.lib.php
+++ b/src/system/taglib/channel/softlinks.lib.php
@@ -69,15 +69,9 @@ function ch_softlinks_all($fvalue, &$ctag, &$refObj, &$row)
             //分析本地链接
             if (!isset($firstLink) && $islocal == 1) $firstLink = $link;
             if ($islocal == 1 && $row['islocal'] != 1) continue;
-<<<<<<< Updated upstream
-            //支持http,迅雷下载,ftp,flashget
-            if (!preg_match("#^http:\/\/|^thunder:\/\/|^ftp:\/\/|^flashget:\/\/#i", $link)) {
-                $link = $link;
-=======
             //支持http、迅雷下载、ftp、flashget
             if (!preg_match("#^(http|https):\/\/|^thunder:\/\/|^ftp:\/\/|^flashget:\/\/#i", $link) && $GLOBALS['cfg_multi_site'] == 'Y') {
                 $link = $GLOBALS['cfg_mainsite'].$link;
->>>>>>> Stashed changes
             }
             $downloads = getDownloads($link);
             $uhash = substr(md5($link), 0, 24);