Skip to content

Commit 9a38970

Browse files
committed
Merge branch 'v2.0.1'
2 parents cc42da7 + 9b8aa37 commit 9a38970

2 files changed

Lines changed: 9 additions & 2 deletions

File tree

README.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,16 @@ $ npm install --save-dev gulp-repl
134134
## Changelog
135135

136136
[v2.0.1][v2.0.1]:
137+
<<<<<<< HEAD
137138
- docs: remove docs of exporting a function
138139
- test: small fix to use `repl.start` instead of the `module.exports`
139140
- dev: make the `module.exports` an object
141+
=======
142+
- test: small fix to use `repl.start` instead of the `module.exports`
143+
- docs: remove docs of exporting a function
144+
- docs: small fix on the docs
145+
- version bump
146+
>>>>>>> v2.0.1
140147

141148
[v2.0.0][v2.0.0]:
142149
- docs: add new api docs
@@ -177,7 +184,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
177184
[b-version]: http://img.shields.io/npm/v/gulp-repl.svg?style=flat-square
178185
[badge-downloads]: http://img.shields.io/npm/dm/gulp-repl.svg?style=flat-square
179186

180-
[v2.0.1]: https://github.com/stringparser/gulp-repl/commit/be44875927a42d8f08dcafa7984db0bfc423e0a3
187+
[v2.0.1]: https://github.com/stringparser/gulp-repl/commit/4420f55db8f9a4887e5a8bd82976a8930e12fb50
181188

182189
[v2.0.0]: https://github.com/stringparser/gulp-repl/commit/be44875927a42d8f08dcafa7984db0bfc423e0a3
183190
[v1.1.2]: https://github.com/stringparser/gulp-repl/commit/572df8ce7cd9d4edd3a2190de021381671a295f0

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "gulp-repl",
33
"author": "Javier Carrillo <stringparser@gmail.com>",
4-
"version": "2.0.0",
4+
"version": "2.0.1",
55
"license": "MIT",
66
"repository": "https://github.com/stringparser/gulp-repl",
77
"description": "a simple repl for gulp",

0 commit comments

Comments
 (0)