diff options
| author | laurawilsonri <laura_wilson@brown.edu> | 2019-02-24 17:40:47 -0500 |
|---|---|---|
| committer | laurawilsonri <laura_wilson@brown.edu> | 2019-02-24 17:40:47 -0500 |
| commit | 03b35e3d6346800821bb830a7c102dede74647fe (patch) | |
| tree | 47c8587c828f9f59e79b127d070728fc2a9f418a /src/client/views/nodes/FormattedTextBox.scss | |
| parent | f7b46167a7fd5d7ecf560dbd72e7d3295ba6c0c9 (diff) | |
Got it compiling
Diffstat (limited to 'src/client/views/nodes/FormattedTextBox.scss')
| -rw-r--r-- | src/client/views/nodes/FormattedTextBox.scss | 5 |
1 files changed, 0 insertions, 5 deletions
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 |