Skip to content
This repository was archived by the owner on Aug 4, 2021. It is now read-only.

Commit 902c848

Browse files
committed
Merge branch 'kellyselden-rollup'
# Conflicts: # CHANGELOG.md
2 parents 80d23f5 + 077f7ae commit 902c848

File tree

5 files changed

+710
-634
lines changed

5 files changed

+710
-634
lines changed

CHANGELOG.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33
## 3.0.4 (unreleased)
44

5-
* Update lockfile [#137](https://github.com/rollup/rollup-plugin-node-resolve/issues/137) and [#131](https://github.com/rollup/rollup-plugin-node-resolve/issues/131)
5+
* Update lockfile [#137](https://github.com/rollup/rollup-plugin-node-resolve/issues/137) and [#131](https://github.com/rollup/rollup-plugin-node-resolve/issues/137)
6+
* Update rollup dependency [#138](https://github.com/rollup/rollup-plugin-node-resolve/issues/137) and [#131](https://github.com/rollup/rollup-plugin-node-resolve/issues/138)
67

78
## 3.0.3
89

0 commit comments

Comments
 (0)