From 462cd06a1bff6e510132a4434a72fd7b4245cfdf Mon Sep 17 00:00:00 2001
From: Stanley Yip <stanley_yip@brown.edu>
Date: Tue, 15 Oct 2019 17:29:57 -0400
Subject: good enough for stanley to start texting i think

---
 src/client/views/MainView.scss | 11 -----------
 1 file changed, 11 deletions(-)

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

diff --git a/src/client/views/MainView.scss b/src/client/views/MainView.scss
index a6b28f488..25af67161 100644
--- a/src/client/views/MainView.scss
+++ b/src/client/views/MainView.scss
@@ -34,15 +34,9 @@
     display: flex;
     flex-direction: column;
     position: absolute;
-<<<<<<< HEAD
     width: 100%;
     height: 100%;
-    border: black 1px solid;
 
-=======
-    width:100%;
-    height:100%;
->>>>>>> 33811c112c7e479813908ba10f72813954a3e289
     .documentView-node-topmost {
         background: lightgrey;
     }
@@ -73,13 +67,8 @@
 
 .mainView-expandFlyoutButton {
     position: absolute;
-<<<<<<< HEAD
     top: 100px;
     right: 30px;
-=======
-    top: 5px;
-    right: 5px;
->>>>>>> 33811c112c7e479813908ba10f72813954a3e289
     cursor: pointer;
 }
 
-- 
cgit v1.2.3-70-g09d2