Merge branch 'master' into ui_improvements

1 files changed, 1 insertions, 11 deletions

diff --git a/src/client/views/collections/CollectionFreeFormView.scss b/src/client/views/collections/CollectionFreeFormView.scss
index 2756874bf..ac2d18352 100644
--- a/src/client/views/collections/CollectionFreeFormView.scss
+++ b/src/client/views/collections/CollectionFreeFormView.scss
@@ -32,13 +32,6 @@
     height: 100%;
   }
 }
-.collectionfreeformview-marquee{
-    border-style: dashed;
-    box-sizing: border-box;
-    position: absolute;
-    border-width: 1px;
-    border-color: black;
-}
 .collectionfreeformview-overlay {
   .collectionfreeformview > .jsx-parser {
     position: absolute;
@@ -48,7 +41,6 @@
     background: $light-color-secondary;
   }
 
-<<<<<<< HEAD
   border: 0px solid transparent;
   border-radius: $border-radius;
   box-sizing: border-box;
@@ -59,7 +51,6 @@
   height: 100%;
   overflow: hidden;
   .collectionfreeformview {
-=======
     .collectionfreeformview > .jsx-parser{
         position:absolute;
         height: 100%;
@@ -69,8 +60,7 @@
     }
         
     border-style: solid;
-    box-sizing: content-box;
->>>>>>> a680579f74380eb016f0ffd61b3818d0850984b5
+    box-sizing: border-box;
     position: absolute;
     top: 0;
     left: 0;