profile.css conflict

packages/TPS/Shop/publishable/assets/styles/profile.css

@@ -12,18 +12,6 @@
 }
 
 .profile-content-inner-mid-block-wrapper {
-<<<<<<< HEAD
-  display: -ms-grid;
-  display: grid;
-  grid-template-columns: repeat(3, 1fr);
-  gap: 4rem;
-  margin-bottom: 2rem;
-}
-
-.profile-content-block-inner span,
-label {
-  display: block;
-=======
     display: -ms-grid;
     display: grid;
     grid-template-columns: repeat(3, 1fr);
@@ -38,7 +26,6 @@ label {
 
 #gender-hidden {
     display: none;
->>>>>>> 9dae385badf20181086210be5a31b1920c170fb3
 }
 
 .profile-content-block form {
@@ -54,20 +41,6 @@ label {
 
 .profile-content-block span,
 label {
-<<<<<<< HEAD
-  font-size: 1.2rem;
-  margin-bottom: 1rem;
-}
-
-.profile-content-block input {
-  border: 0.1rem solid rgba(0, 0, 0, 30%);
-  border-radius: 0.5rem;
-  padding-left: 2rem;
-  max-width: 40rem;
-  width: 100%;
-  height: 5rem;
-  font-size: 1.4rem;
-=======
     font-size: 1.2rem;
     margin-bottom: 1rem;
 }
@@ -114,7 +87,6 @@ label {
 
 .gender-dropdown li:first-child {
     border-bottom: 0.1rem solid rgba(0, 0, 0, 30%);
->>>>>>> 9dae385badf20181086210be5a31b1920c170fb3
 }
 
 .gender-dropdown {
@@ -258,65 +230,6 @@ label {
 
 /* MEDIA QUERIES  ===================================*/
 @media screen and (max-width: 1440px) {
-<<<<<<< HEAD
-  .profile-content-inner-bottom-second {
-      padding-bottom: 6rem;
-  }
-}
-
-@media screen and (max-width: 920px) {
-  .profile-content-inner-mid-block-wrapper,
-  .delivery-content-mid-left-blocks {
-      column-gap: 2rem;
-  }
-}
-
-@media screen and (max-width: 720px) {
-  .profile-content-inner-mid-block-wrapper,
-  .delivery-content-mid-left-blocks {
-      gap: 2rem;
-      grid-template-columns: 1fr 1fr;
-  }
-}
-
-@media screen and (max-width: 520px) {
-  .profile-content-inner-mid-block-wrapper {
-      grid-template-columns: 1fr;
-  }
-
-  .delivery-content-mid-left-blocks {
-      display: -webkit-box;
-      display: -moz-box;
-      display: -ms-flexbox;
-      display: -webkit-flex;
-      display: flex;
-      flex-direction: column;
-  }
-
-  .profile-content-block input,
-  .content-link,
-  .content-block {
-      max-width: unset;
-  }
-
-  .profile-content-inner-bottom-second {
-      display: -ms-grid;
-      display: grid;
-      grid-template-columns: 1fr;
-  }
-
-  .save-button {
-      justify-self: center;
-      align-self: center;
-      max-width: unset;
-  }
-}
-
-@media screen and (max-width: 500px) {
-  .profile-content-block button {
-      top: 3.7rem;
-  }
-=======
     .profile-content-inner-bottom-second {
         padding-bottom: 6rem;
     }
@@ -374,5 +287,4 @@ label {
     .profile-content-block button {
         top: 3.7rem;
     }
->>>>>>> 9dae385badf20181086210be5a31b1920c170fb3
 }

packages/TPS/Shop/src/Resources/views/shop/customers/account/address/index.blade.php

@@ -8,7 +8,7 @@
 
     <div class="account-content">
 
-        @include('shop::customers.account.partials.sidemenu')
+        
 
         <div class="account-layout">
 
@@ -16,15 +16,6 @@
                 <span class="back-icon"><a href="{{ route('customer.profile.index') }}"><i class="icon icon-menu-back"></i></a></span>
                 <span
                     class="account-heading">{{ __('shop::app.customer.account.address.index.title') }}</span>
-
-                @if (! $addresses->isEmpty())
-                    <span class="account-action">
-                    <a href="{{ route('customer.address.create') }}">{{ __('shop::app.customer.account.address.index.add') }}</a>
-                </span>
-                @else
-                    <span></span>
-                @endif
-                <div class="horizontal-rule"></div>
             </div>
 
             {!! view_render_event('bagisto.shop.customers.account.address.list.before', ['addresses' => $addresses]) !!}
@@ -102,6 +93,7 @@
             </div>
 
             {!! view_render_event('bagisto.shop.customers.account.address.list.after', ['addresses' => $addresses]) !!}
+            
         </div>
     </div>
 @endsection