Merge pull request #362 from caiopo/master

Fix commited merge conflict
wheresrhys · Sep 19, 2018 · d7e3c16 · d7e3c16
2 parents 5e6c6df + a22531a
commit d7e3c16
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/docs/installation.md b/docs/installation.md
@@ -28,12 +28,7 @@ Some exceptions include:
 
 ## Global fetch
 
-<<<<<<< HEAD
-
-=======
-
-> > > > > > > 315bf4bee040aa243eaf3b2a418741d35444bccb
-> > > > > > > By default fetch-mock assumes `fetch` is a global so once you've required fetch-mock refer to the quickstart and api docs.
+By default fetch-mock assumes `fetch` is a global so once you've required fetch-mock refer to the quickstart and api docs.
 
 ### Polyfilling fetch