* Fix conflicts.

2018-04-11 11:23:29 +08:00
parent 0c40742802
commit 34243df686
3 changed files with 3 additions and 39 deletions
@@ -53,13 +53,8 @@ class productModel extends model

        $productIndex  = '<div class="btn-group angle-btn"><div class="btn-group"><button data-toggle="dropdown" type="button" class="btn">' . $this->lang->product->index . ' <span class="caret"></span></button>';
        $productIndex .= '<ul class="dropdown-menu">';
-<<<<<<< HEAD
-        if(common::hasPriv('product', 'index'))  $productIndex .= '<li class="active">' . html::a(helper::createLink('product', 'index'), '<i class="icon icon-home"></i> ' . $this->lang->product->index) . '</li>';
+        if(common::hasPriv('product', 'index'))  $productIndex .= '<li>' . html::a(helper::createLink('product', 'index', 'locate=no'), '<i class="icon icon-home"></i> ' . $this->lang->product->index) . '</li>';
        if(common::hasPriv('product', 'all'))    $productIndex .= '<li>' . html::a(helper::createLink('product', 'all'), '<i class="icon icon-cards-view"></i> ' . $this->lang->product->all) . '</li>';
-=======
-        if(common::hasPriv('product', 'index')) $productIndex .= '<li>' . html::a(helper::createLink('product', 'index', 'locate=no'), '<i class="icon icon-home"></i> ' . $this->lang->product->index) . '</li>';
-        if(common::hasPriv('product', 'all')) $productIndex .= '<li>' . html::a(helper::createLink('product', 'all'), '<i class="icon icon-cards-view"></i> ' . $this->lang->product->all) . '</li>';
->>>>>>> fe3027623e080063a7012af4face75af2fa7529a
        if(common::hasPriv('product', 'create')) $productIndex .= '<li>' . html::a(helper::createLink('product', 'create'), '<i class="icon icon-plus"></i> ' . $this->lang->product->create) . '</li>';
        $productIndex .= '</ul></div></div>';
        $productIndex .= $selectHtml;