fix: merge conflict

paultibbetts · Jun 28, 2020 · 7f69c7a · 7f69c7a · vercel · Jun 28, 2020
1 parent 38b319a
commit 7f69c7a
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 29 deletions.
diff --git a/src/components/Collection/Collection.tsx b/src/components/Collection/Collection.tsx
@@ -31,19 +31,9 @@ export const Collection = (props: Props) => {
   const pageNumber: string = page.toString() || '1';
 
   const renderList = (data: StoryModel[], perPage: number) => {
-<<<<<<< HEAD
-    let classNames = "collection content";
-    if (isFetching) {
-      classNames = `${classNames} is-fetching`;
-    }
-    return (
-      <div className={classNames}>
-        <ol className="collection__list">
-=======
     return (
       <div>
         <ol>
->>>>>>> feat/dark-mode
           {renderStories(data, perPage)}
         </ol>
       </div>
@@ -74,19 +64,12 @@ export const Collection = (props: Props) => {
       return (
         <div>
           {renderList(content, content.length)}
-<<<<<<< HEAD
-          <Pagination 
-            page={pageNumber ? pageNumber : '1'} 
-            type={type} 
-          />
-=======
           <div className="my-4">
             <Pagination 
               page={pageNumber ? pageNumber : '1'} 
               type={type}
             />
           </div>
->>>>>>> feat/dark-mode
         </div>
       );
     }
@@ -104,11 +87,7 @@ export const Collection = (props: Props) => {
   }
 
   return (
-<<<<<<< HEAD
-    <div className="container">
-=======
     <div>
->>>>>>> feat/dark-mode
       {renderContent(collection)}
     </div>
   );

diff --git a/src/components/Comment/Comment.tsx b/src/components/Comment/Comment.tsx
@@ -33,10 +33,6 @@ export const Comment = (props: ICommentProps): JSX.Element => {
           dangerouslySetInnerHTML={renderMarkup(comment.content)}
         />
       </div>
-<<<<<<< HEAD
-      <div dangerouslySetInnerHTML={renderMarkup(comment.content)} />
-=======
->>>>>>> feat/dark-mode
       {comment.comments.length > 0
         ? <Comments data={comment.comments} />
         : ''

diff --git a/src/components/Item/Item.tsx b/src/components/Item/Item.tsx
@@ -50,11 +50,7 @@ export const Item = (props: Props) => {
             }
           </div>
           <div
-<<<<<<< HEAD
-            className="item__content"
-=======
             className="mt-3"
->>>>>>> feat/dark-mode
             dangerouslySetInnerHTML={renderMarkup(data.content)}
           />
         </div>