From 786075045d3f0df3373ccaf13d78ec628019bdfd Mon Sep 17 00:00:00 2001
From: Deepak Singh Gusain <deepaksingh.gusain227@webkul.com>
Date: Fri, 21 Jan 2022 14:19:32 +0530
Subject: [PATCH] fixed conflicts at nav left

---
 .../views/layouts/nav-left.blade.php          | 22 -------------------
 1 file changed, 22 deletions(-)

diff --git a/packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php b/packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php
index a0b62d8ed..9ecb00939 100755
--- a/packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php
@@ -65,28 +65,6 @@
                 @endif
             </li>
             @endforeach
-<<<<<<< HEAD
-
-            <li class="menu-item">
-                <a class="menubar-ancor" href="#">
-                    <span class="icon-menu icon locale-icon"></span>
-
-                    <span class="menu-label"> {{ __('admin::app.datagrid.locale') }}  {{ $allLocales[$currentLocaleCode] }} </span>
-
-                    <span class="icon arrow-icon  {{ $menu->getActive($menuItem) == 'active' ? 'rotate-arrow-icon' : '' }}  {{ ( core()->getCurrentLocale() && core()->getCurrentLocale()->direction == 'rtl' ) ? 'arrow-icon-right' :'arrow-icon-left' }}"></span>                    
-                </a>
-                <ul class="sub-menubar">
-                    @foreach ($allLocales as $code => $name)  
-                    <li class="sub-menu-item">
-                        <a href="{{ url()->current() . '?' . http_build_query(array_merge(request()->all(), ['admin_locale' => $code])) }}">
-                            <span class="menu-label">{{ $name }}</span>
-                        </a>
-                    </li>
-                    @endforeach    
-                </ul>
-            </li>
-=======
->>>>>>> master
         </ul>
     </script>