Skip to content

Commit 86a048b

Browse files
author
Carlos Rufo Jimenez
committed
fix
1 parent d5ba081 commit 86a048b

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

src/index.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,7 @@ import { InMemoryCache } from 'apollo-cache-inmemory'
1010
import { BrowserRouter } from 'react-router-dom'
1111
import { AUTH_TOKEN } from './constants'
1212
import { setContext } from 'apollo-link-context'
13-
<<<<<<< HEAD
1413
import { split } from 'apollo-link'
15-
=======
16-
import { split } from 'apollo-client-preset'
17-
>>>>>>> 4f0d49bc754427951f0ce8b0345373051b6047b0
1814
import { WebSocketLink } from 'apollo-link-ws'
1915
import { getMainDefinition } from 'apollo-utilities'
2016

0 commit comments

Comments
 (0)