From 227e8443a9fc9ca0c3f2e02e85dbd80b26a8b7b2 Mon Sep 17 00:00:00 2001
From: Fawn <fangrui_tong@brown.edu>
Date: Mon, 22 Apr 2019 17:19:41 -0400
Subject: merge

---
 src/client/views/DocumentDecorations.scss | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/client/views/DocumentDecorations.scss')

diff --git a/src/client/views/DocumentDecorations.scss b/src/client/views/DocumentDecorations.scss
index 7bd50b716..4709cbab3 100644
--- a/src/client/views/DocumentDecorations.scss
+++ b/src/client/views/DocumentDecorations.scss
@@ -3,13 +3,9 @@
 .documentDecorations {
     position: absolute;
 }
-<<<<<<< HEAD
 
-#documentDecorations-container {
-=======
 .documentDecorations-container {
     z-index: $docDecorations-zindex;
->>>>>>> b63bcb791013766d5d16e4f38964499268f904c4
     position: absolute;
     top: 0;
     left: 0;
-- 
cgit v1.2.3-70-g09d2