From 03b35e3d6346800821bb830a7c102dede74647fe Mon Sep 17 00:00:00 2001 From: laurawilsonri Date: Sun, 24 Feb 2019 17:40:47 -0500 Subject: Got it compiling --- src/client/views/nodes/FormattedTextBox.scss | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/client/views/nodes/FormattedTextBox.scss') diff --git a/src/client/views/nodes/FormattedTextBox.scss b/src/client/views/nodes/FormattedTextBox.scss index 12604f843..97d7f1426 100644 --- a/src/client/views/nodes/FormattedTextBox.scss +++ b/src/client/views/nodes/FormattedTextBox.scss @@ -9,11 +9,6 @@ } .formattedTextBox-cont { -<<<<<<< HEAD background: white; padding: 1vw; -======= - background: beige; - padding: 0; ->>>>>>> d9d55e422826da1fe87aa7973c92e54bc0c99f02 } \ No newline at end of file -- cgit v1.2.3-70-g09d2