fix conflict

This commit is contained in:
LAPTOP-DGCU80CH\user1
2020-12-03 12:37:34 +08:00
parent c8cb41600e
commit 09db6dfcb0
6 changed files with 260 additions and 20 deletions
+1
View File
@@ -70,6 +70,7 @@
</div>
<div class="navbar-brand">
Kod Cawangan : <span>{{ $cawangan_info['kodcaw'] }}</span>
<input type="text" hidden name="kodcaw" id="kodcaw" value="{{ $cawangan_info['kodcaw'] }}">
</div>
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="{{ __('Toggle navigation') }}">
<span class="navbar-toggler-icon"></span>