From e1a90348d55a1c430cece48b8dfd10e37f1ba7cc Mon Sep 17 00:00:00 2001
From: Andrej <andrej.jugovic7@gmail.com>
Date: Tue, 16 May 2023 10:49:40 +0200
Subject: [PATCH] Resolve conflicts after navigator merge

---
 app/assets/stylesheets/repositories.scss                 | 9 ---------
 .../stylesheets/repository/repository_toolbar.scss       | 3 ---
 2 files changed, 12 deletions(-)

diff --git a/app/assets/stylesheets/repositories.scss b/app/assets/stylesheets/repositories.scss
index 3b575e137..b5b98ab18 100644
--- a/app/assets/stylesheets/repositories.scss
+++ b/app/assets/stylesheets/repositories.scss
@@ -7,10 +7,7 @@
 
 .repository-show {
   height: calc(100vh - var(--navbar-height));
-<<<<<<< HEAD
   left: var(--left-navigation-width);
-=======
->>>>>>> develop
   margin: 0;
   padding: 0 2em;
   position: absolute;
@@ -37,10 +34,7 @@
       background-color: $color-white;
       border: 0;
       display: flex;
-<<<<<<< HEAD
       left: var(--left-navigation-width);
-=======
->>>>>>> develop
       margin-left: 0em;
       padding: 0 2em;
       position: fixed;
@@ -164,10 +158,7 @@
     bottom: 0;
     display: flex;
     height: 5em;
-<<<<<<< HEAD
     left: var(--left-navigation-width);
-=======
->>>>>>> develop
     padding: 0 2em;
     position: fixed;
     transition: .4s $timing-function-sharp;
diff --git a/app/assets/stylesheets/repository/repository_toolbar.scss b/app/assets/stylesheets/repository/repository_toolbar.scss
index ecd913594..7f02d847f 100644
--- a/app/assets/stylesheets/repository/repository_toolbar.scss
+++ b/app/assets/stylesheets/repository/repository_toolbar.scss
@@ -9,10 +9,7 @@
     flex-grow: 1;
     flex-wrap: nowrap;
     height: 6em;
-<<<<<<< HEAD
     left: var(--left-navigation-width);
-=======
->>>>>>> develop
     padding: 1em 2em 0;
     position: fixed;
     top: calc(4em + var(--navbar-height));