From 6df90c971198baca1fcb9581ea21d1e117c49e6e Mon Sep 17 00:00:00 2001
From: john <johnbarlas39@gmail.com>
Date: Mon, 1 May 2017 21:07:20 +0300
Subject: [PATCH] resolve css merge conflict for notes
---
app/components/SimpleEditor/panes/Notes/notes.scss | 4 ----
1 file changed, 4 deletions(-)
diff --git a/app/components/SimpleEditor/panes/Notes/notes.scss b/app/components/SimpleEditor/panes/Notes/notes.scss
index e0cbaa6..ac16faf 100644
--- a/app/components/SimpleEditor/panes/Notes/notes.scss
+++ b/app/components/SimpleEditor/panes/Notes/notes.scss
@@ -23,11 +23,7 @@ $bg-rgba: rgba(255, 255, 255, 0);
cursor: row-resize;
height: 10px;
position: absolute;
-<<<<<<< HEAD
- top: -14px;
-=======
top: -6px;
->>>>>>> notes editor in separate pane
width: 100%;
}
}
--
GitLab