From cef3bb806e63176d78b34ea8971f9aa951abddc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9my=20Coutable?= <remy@rymai.me>
Date: Wed, 8 Nov 2017 12:29:41 +0100
Subject: [PATCH] Resolve CSS conflicts
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Rémy Coutable <remy@rymai.me>
---
 app/assets/stylesheets/framework/avatar.scss | 3 ---
 app/assets/stylesheets/framework/modal.scss  | 4 ----
 app/assets/stylesheets/pages/note_form.scss  | 4 ----
 3 files changed, 11 deletions(-)

diff --git a/app/assets/stylesheets/framework/avatar.scss b/app/assets/stylesheets/framework/avatar.scss
index 65eca422cbd..240381aec3f 100644
--- a/app/assets/stylesheets/framework/avatar.scss
+++ b/app/assets/stylesheets/framework/avatar.scss
@@ -59,13 +59,10 @@
   &.avatar-tile {
     border-radius: 0;
     border: 0;
-<<<<<<< HEAD
   }
 
   &.avatar-placeholder {
     border: 0;
-=======
->>>>>>> upstream/master
   }
 
   &:not([href]):hover {
diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss
index 78dc725fbc2..171b12cba66 100644
--- a/app/assets/stylesheets/framework/modal.scss
+++ b/app/assets/stylesheets/framework/modal.scss
@@ -48,7 +48,3 @@ body.modal-open {
 .modal.popup-dialog {
   display: block;
 }
-<<<<<<< HEAD
-=======
-
->>>>>>> upstream/master
diff --git a/app/assets/stylesheets/pages/note_form.scss b/app/assets/stylesheets/pages/note_form.scss
index 91a4b05ef0b..14514b2f193 100644
--- a/app/assets/stylesheets/pages/note_form.scss
+++ b/app/assets/stylesheets/pages/note_form.scss
@@ -111,15 +111,11 @@
   margin: auto;
   align-items: center;
 
-<<<<<<< HEAD
-  .md-area {
-=======
   .icon {
     margin-right: $issuable-warning-icon-margin;
   }
 
   + .md-area {
->>>>>>> upstream/master
     border-top-left-radius: 0;
     border-top-right-radius: 0;
   }
-- 
2.30.9