accepted incoming conflict

src/client/js/components/PageTimeline.jsx

@@ -18,16 +18,12 @@ class PageTimeline extends React.Component {
     this.showPages = this.showPages.bind(this);
     this.handlePage = this.handlePage.bind(this);
     this.state = {
-<<<<<<< HEAD
-      pages: [],
-=======
       activePage: 1,
       totalPages: 0,
       limit: appContainer.getConfig().recentCreatedLimit,
       isEnabled: appContainer.getConfig().isEnabledTimeline,
       // TODO: remove after when timeline is implemented with React and inject data with props
       pages: this.props.pages,
->>>>>>> feat/transplant-tabs-to-modal-for-master-merge
     };
 
   }