From 9cf013c5b64af47d5199ef8168a5af6c29461ed9 Mon Sep 17 00:00:00 2001 From: laurawilsonri Date: Sat, 23 Feb 2019 18:20:24 -0500 Subject: stugggggglin --- src/client/views/collections/CollectionFreeFormView.scss | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/client/views/collections/CollectionFreeFormView.scss') 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 -- cgit v1.2.3-70-g09d2