From 57dcac706d760468ce95b4ff340e8a0f43a83c73 Mon Sep 17 00:00:00 2001
From: jorge-vitrubio <jorge@vitrubio.net>
Date: Tue, 27 Apr 2021 21:30:53 +0200
Subject: [PATCH] solved merge with main

---
 src/assets/scss/modules/_header.scss | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/assets/scss/modules/_header.scss b/src/assets/scss/modules/_header.scss
index 194e5e7..40d0939 100644
--- a/src/assets/scss/modules/_header.scss
+++ b/src/assets/scss/modules/_header.scss
@@ -6,11 +6,6 @@
       @include flex-align(left, middle);
       padding: $global-padding*2;
     }
-<<<<<<< HEAD
-   menu {
-    justify-self: end;
-   }
-=======
     nav {
       @include xy-cell(auto);
       @include flex;
@@ -22,7 +17,6 @@
         }
       }
     }
->>>>>>> dev
   }
 @include breakpoint(small){
 }