resolved conflicts

packages/Webkul/Admin/publishable/assets/mix-manifest.json

@@ -1,4 +1,4 @@
 {
     "/js/admin.js": "/js/admin.js?id=94da304c8b02ad3ba649",
-    "/css/admin.css": "/css/admin.css?id=4afe303d7ebf77ad3aa4"
+    "/css/admin.css": "/css/admin.css?id=cfa1bee6a2b3d8b94279"
 }

packages/Webkul/Admin/src/Resources/assets/sass/partials/_default.scss

@@ -123,10 +123,6 @@ body {
                 display: block;
                 text-align: left;
             }
-
-            i.icon {
-                margin-left: 10px;
-            }
         }
 
         .notifications {

packages/Webkul/Admin/src/Resources/views/layouts/nav-left.blade.php

@@ -65,6 +65,7 @@
                 @endif
             </li>
             @endforeach
+<<<<<<< HEAD
 
             <li class="menu-item">
                 <a class="menubar-ancor" href="#">
@@ -84,6 +85,8 @@
                     @endforeach    
                 </ul>
             </li>
+=======
+>>>>>>> master
         </ul>
     </script>
 

packages/Webkul/Admin/src/Resources/views/layouts/nav-top.blade.php

@@ -6,6 +6,10 @@
         'completed'=> trans('admin::app.notification.order-status-messages.completed'),
         'processing' => trans('admin::app.notification.order-status-messages.processing')
     ];
+
+    $allLocales = core()->getAllLocales()->pluck('name', 'code');
+
+    $currentLocaleCode = core()->getRequestedLocaleCode('admin_locale');
 @endphp
 
 <div class="navbar-top">
@@ -53,6 +57,29 @@
                 read-all-title="{{ __('admin::app.notification.read-all') }}">
             </notification>
 
+            <div class="profile-info">
+
+                <div class="dropdown-toggle">
+
+                    <i class="icon locale-icon" style="height:34px;width:34px"></i>
+                </div>
+
+                <div class="dropdown-list bottom-right">
+                    <div class="dropdown-container">
+                        <ul>
+                            @foreach ($allLocales as $code => $name)
+                                <li>
+                                    <a href="{{ url()->current() . '?' . http_build_query(array_merge(request()->all(), ['admin_locale' => $code])) }}"
+                                        style="{{ $code == $currentLocaleCode ? 'color:blue' : '' }}">
+                                        {{ $name }}
+                                    </a>
+                                </li>
+                            @endforeach
+                        </ul>
+                    </div>
+                </div>
+            </div>
+
             <div class="profile-info">
                 <div class="dropdown-toggle">
                     <div style="display: inline-block; vertical-align: middle;">