From 5a8243055397f3a438d21d2a6fd404e6eb3c50e5 Mon Sep 17 00:00:00 2001
From: Jori Lallo <jtlallo@gmail.com>
Date: Mon, 29 May 2017 18:22:10 -0700
Subject: [PATCH] Rebase fix

---
 frontend/components/DocumentPreview/DocumentPreview.js | 1 +
 frontend/scenes/Collection/Collection.js               | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/frontend/components/DocumentPreview/DocumentPreview.js b/frontend/components/DocumentPreview/DocumentPreview.js
index 164fa3fd..0817d721 100644
--- a/frontend/components/DocumentPreview/DocumentPreview.js
+++ b/frontend/components/DocumentPreview/DocumentPreview.js
@@ -32,6 +32,7 @@ const DocumentLink = styled(Link)`
   }
 `;
 
+// $FlowIssue
 const TruncatedMarkdown = styled(Markdown)`
   pointer-events: none;
 `;
diff --git a/frontend/scenes/Collection/Collection.js b/frontend/scenes/Collection/Collection.js
index 1b4e8459..72f2f039 100644
--- a/frontend/scenes/Collection/Collection.js
+++ b/frontend/scenes/Collection/Collection.js
@@ -9,7 +9,7 @@ import CollectionsStore from 'stores/CollectionsStore';
 
 import Layout from 'components/Layout';
 import CenteredContent from 'components/CenteredContent';
-import AtlasPreviewLoading from 'components/AtlasPreviewLoading';
+import PreviewLoading from 'components/PreviewLoading';
 
 type Props = {
   collections: CollectionsStore,
@@ -56,7 +56,7 @@ type State = {
         {this.state.redirectUrl && <Redirect to={this.state.redirectUrl} />}
 
         <CenteredContent>
-          <AtlasPreviewLoading />
+          <PreviewLoading />
         </CenteredContent>
       </Layout>
     );