cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-21 13:24:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix conflict

Browse Source
This commit is contained in:
Mohd Arief
2018-06-27 17:25:11 +08:00
parent 32b0eda067
commit 534ad41fd3
3 changed files with 181 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/js/components/LocaleDropdown.vue
-3
View File
@@ -12,7 +12,6 @@
{{ value }}
</a>
</div>
<<<<<<< HEAD
</li>
<ul class="navbar-nav mr-auto">
<li class="nav-item">
@@ -31,13 +30,11 @@
<li class="nav-item"><router-link :to="{ name: 'admin.complete-order' }" class="nav-link">{{ $t('Complete Order') }}</router-link></li>
<li class="nav-item"><router-link :to="{ name: 'admin.transaction-history' }" class="nav-link">{{ $t('Transaction History') }}</router-link></li>
<li class="nav-item"><router-link :to="{ name: 'admin.upload-supplier-bank-slip' }" class="nav-link">{{ $t('Upload Supplier Bank Slip to System') }}</router-link></li>
=======
</li> -->
<li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Update Rate</a></li>
<li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Complete Order</a></li>
<li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Transaction History</a></li>
<li v-if="(user && role == 'admin')"><a class="nav-link" href="#" role="button">Upload Supplier Bank Slip to System</a></li>
>>>>>>> 781c78b942b6b1024c815441cfe55fd912e41551
</ul>
<!-- update rate dialog -->