Skip to content

Commit

Permalink
Fix commited merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
caiopo authored and caiopo committed Sep 12, 2018
1 parent 91cefd6 commit a22531a
Showing 1 changed file with 1 addition and 6 deletions.
7 changes: 1 addition & 6 deletions docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit a22531a

Please sign in to comment.