diff options
| author | laurawilsonri <laura_wilson@brown.edu> | 2019-02-23 18:20:24 -0500 |
|---|---|---|
| committer | laurawilsonri <laura_wilson@brown.edu> | 2019-02-23 18:20:24 -0500 |
| commit | 9cf013c5b64af47d5199ef8168a5af6c29461ed9 (patch) | |
| tree | 4204a9661877f81007bb457e624d3c7ac5104553 /src/client/views/collections/CollectionFreeFormView.scss | |
| parent | 784eb6e6ba1daf00d3c74239f88669b669e9739c (diff) | |
stugggggglin
Diffstat (limited to 'src/client/views/collections/CollectionFreeFormView.scss')
| -rw-r--r-- | src/client/views/collections/CollectionFreeFormView.scss | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/client/views/collections/CollectionFreeFormView.scss b/src/client/views/collections/CollectionFreeFormView.scss index fa1372925..55f5c2684 100644 --- a/src/client/views/collections/CollectionFreeFormView.scss +++ b/src/client/views/collections/CollectionFreeFormView.scss @@ -12,7 +12,6 @@ top: 0; left: 0; } -<<<<<<< HEAD } .border { @@ -31,6 +30,4 @@ #prevCursor { animation: blink 1s infinite; -======= ->>>>>>> 3f98d6ec6050e7faa15179871f0d9669c1188a78 }
\ No newline at end of file |