Merge remote-tracking branch 'origin/master'

# Conflicts: # application/views/mobile_first/ch-pc.php
4 years ago · 675b1be0b4
parent 584eb6b4e4 474a5d1668
commit 675b1be0b4
1 changed files with 0 additions and 1 deletions
--- a/application/views/mobile_first/ch-pc.php
+++ b/application/views/mobile_first/ch-pc.php
@ -218,7 +218,6 @@
            </div>
            </aside>
        </div>
-        <!--@TIPS-RIGHT-TOP@-->
        <!--@TIPS-RIGHT@-->
    </div>
    <div id="main_content_next">