Revert "Conflicts (#2108)"

This reverts commit 81942a8.
apollographql · Sep 4, 2017 · 3ed9f20 · 3ed9f20
1 parent 81942a8
commit 3ed9f20
Show file tree

Hide file tree

Showing 7 changed files with 4,022 additions and 4,039 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -4,10 +4,12 @@
     {
       "name": "Test",
       "type": "node",
-      "request": "launch",
       "program": "${workspaceRoot}/node_modules/mocha/bin/_mocha",
       "stopOnEntry": false,
-      "args": ["--no-timeouts", "lib/test/tests.js"],
+      "args": [
+        "--no-timeouts",
+        "lib/test/tests.js"
+      ],
       "cwd": "${workspaceRoot}",
       "runtimeExecutable": null,
       "sourceMaps": true,

diff --git a/README.md b/README.md
@@ -30,7 +30,7 @@ To use this client in a web browser or mobile app, you'll need a build system ca
 
 ## Usage
 
-If you know you want to use the core `apollo-client` package you can get started by constructing an instance of the core class [`ApolloClient`][] with a network interface created by the [`createNetworkInterface`][] function like so:
+If you know you want to use the core `apollo-client` package you can get started by constructing an instance of the core class [`ApolloClient`][] with a network interface created by network interface you may call the [`createNetworkInterface`][] function like so:
 
 ```js
 import ApolloClient, { createNetworkInterface } from 'apollo-client';