Skip to content

Commit d5ba081

Browse files
author
Carlos Rufo Jimenez
committed
fix
2 parents e2d14d8 + 4f0d49b commit d5ba081

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

src/index.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ 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
1314
import { split } from 'apollo-link'
15+
=======
16+
import { split } from 'apollo-client-preset'
17+
>>>>>>> 4f0d49bc754427951f0ce8b0345373051b6047b0
1418
import { WebSocketLink } from 'apollo-link-ws'
1519
import { getMainDefinition } from 'apollo-utilities'
1620

0 commit comments

Comments
 (0)