From 087f14ea0b7a4589d3a5c3a670c20b37d7e8d620 Mon Sep 17 00:00:00 2001
From: "Thomas F. K. Jorna" <thomasfkjorna@gmail.com>
Date: Thu, 29 Jul 2021 16:26:08 +0200
Subject: solve merge conflicts

---
 pages/index.tsx | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/pages/index.tsx b/pages/index.tsx
index 3540a4c..c1d9a18 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -132,14 +132,9 @@ export function GraphPage() {
   const graph3dRef = useRef<any>(null)
 
   useEffect(() => {
-<<<<<<< HEAD
     const fg = threeDim ? graph3dRef.current : graph2dRef.current
     const socket = new ReconnectingWebSocket('ws://localhost:35903')
     socket.addEventListener('open', (event) => {
-=======
-    const socket = new WebSocket('ws://localhost:35903')
-    socket.addEventListener('open', () => {
->>>>>>> 4e3d884c402b7dc7d12f0cae88a9a312b10f166f
       console.log('Connection with Emacs established')
     })
     socket.addEventListener('message', (event) => {
@@ -174,17 +169,6 @@ export function GraphPage() {
     })
   }, [])
 
-<<<<<<< HEAD
-  useEffect(() => {
-    if (!emacsNodeId) {
-      return
-    }
-    //fetchGraphData()
-  }, [emacsNodeId])
-=======
-  const [threeDim, setThreeDim] = useState(false)
->>>>>>> 4e3d884c402b7dc7d12f0cae88a9a312b10f166f
-
   if (!graphData) {
     return null
   }
@@ -318,7 +302,7 @@ export const Graph = function (props: GraphProps) {
         return false
       }
 
-      return !links.some(link => !['parent', 'cite'].includes(link.type))
+      return !links.some((link) => !['parent', 'cite'].includes(link.type))
     })
   }, [filter, graphData.nodes, linksByNodeId])
 
-- 
cgit v1.2.3