1.2.0-rc.2

Silic0nS0ldier · Silic0nS0ldier · commit 630421454772 · 2018-02-03T15:17:19.000+11:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## [Unreleased]
 
+## [1.2.0-rc.2] - 2018-02-03
+### Fixed
+- Issue with internal yarnpkg/lockfile dependency that slipped testing.
+
 ## [1.2.0-rc.1] - 2018-02-02
 ### Added
 - Duplicate dependency checker that uses `yarn.lock`. This is a stop-gap solution for Yarn's inability to report flat mode dependency conflicts when running in a non-interactive context.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@userfrosting/merge-package-dependencies",
-  "version": "1.2.0-rc.1",
+  "version": "1.2.0-rc.2",
   "description": "Merge NPM, Yarn or Bower package dependencies into one package, with semvar rules respected.",
   "repository": "github:userfrosting/merge-package-dependencies",
   "main": "lib/index.js",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@userfrosting/merge-package-dependencies",`
`3`		`- "version": "1.2.0-rc.1",`
	`3`	`+ "version": "1.2.0-rc.2",`
`4`	`4`	`"description": "Merge NPM, Yarn or Bower package dependencies into one package, with semvar rules respected.",`
`5`	`5`	`"repository": "github:userfrosting/merge-package-dependencies",`
`6`	`6`	`"main": "lib/index.js",`