solved merge with main

This commit is contained in:
jorge 2021-04-27 21:30:53 +02:00
parent a6ca043da8
commit 57dcac706d
1 changed files with 0 additions and 6 deletions

View File

@ -6,11 +6,6 @@
@include flex-align(left, middle); @include flex-align(left, middle);
padding: $global-padding*2; padding: $global-padding*2;
} }
<<<<<<< HEAD
menu {
justify-self: end;
}
=======
nav { nav {
@include xy-cell(auto); @include xy-cell(auto);
@include flex; @include flex;
@ -22,7 +17,6 @@
} }
} }
} }
>>>>>>> dev
} }
@include breakpoint(small){ @include breakpoint(small){
} }