Update CHANGELOG to mention the change to the merge data function.

bmuenzenmeyer · bmuenzenmeyer · commit 1d63d12a9c0d · 2015-09-25T00:11:33.000-05:00
Closes #150
diff --git a/CHANGELOG b/CHANGELOG
@@ -2,8 +2,10 @@ THIS CHANGELOG IS AN ATTEMPT TO DOCUMENT CHANGES TO THIS PROJECT.
 
 PL-node-v0.13.0
 - FIX: Cleanup an old file and an incorrect entry in the .gitignore file
-- CHG: Change order of pattern addition and ~variant pattern addition so they build naturally in the menu. 
+- CHG: Change order of pattern addition and ~variant pattern addition so they build naturally in the menu.
 - THX: Thanks @e2tha-e for the flurry of pull requests!
+- CHG: Update data merge function to prioritize handle pattern~variant.json files
+- THX: Thanks @e2tha-e for finding, fixing, and unit testing the data merge issue.
 
 PL-node-v0.12.0
  - ADD: Gulp support arrives with an optional configuration
diff --git a/package.gulp.json b/package.gulp.json
@@ -1,7 +1,7 @@
 {
   "name": "patternlab-node",
   "description": "Pattern Lab is a collection of tools to help you create atomic design systems. This is the node command line interface (CLI).",
-  "version": "0.12.0",
+  "version": "0.13.0",
   "devDependencies": {
     "browser-sync": "^2.8.2",
     "del": "^1.2.1",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "patternlab-node",`
`3`	`3`	`"description": "Pattern Lab is a collection of tools to help you create atomic design systems. This is the node command line interface (CLI).",`
`4`		`- "version": "0.12.0",`
	`4`	`+ "version": "0.13.0",`
`5`	`5`	`"devDependencies": {`
`6`	`6`	`"browser-sync": "^2.8.2",`
`7`	`7`	`"del": "^1.2.1",`