From 73bc316029c285ff9af7fbb087eb7306fb789769 Mon Sep 17 00:00:00 2001
From: Sergey Yarkov <serzh.yarkov@gmail.com>
Date: Mon, 16 Mar 2020 21:41:41 +0300
Subject: [PATCH] restore

---
 pages/articles.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pages/articles.js b/pages/articles.js
index 845768e..5560b3d 100644
--- a/pages/articles.js
+++ b/pages/articles.js
@@ -31,8 +31,4 @@ const Articles = () => {
   )
 }
 
-<<<<<<< HEAD
 export default withApollo(Articles)
-=======
-export default withApollo({ ssr: true })(Articles)
->>>>>>> d845bf167260c295393e750017fc4e327e987967