bumped the version

bmuenzenmeyer · bmuenzenmeyer · commit 56c0efa19ee0 · 2015-11-12T00:59:32.000-06:00
diff --git a/builder/lineage_hunter.js b/builder/lineage_hunter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/list_item_hunter.js b/builder/list_item_hunter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/media_hunter.js b/builder/media_hunter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/object_factory.js b/builder/object_factory.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/parameter_hunter.js b/builder/parameter_hunter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/pattern_assembler.js b/builder/pattern_assembler.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
@@ -262,13 +262,7 @@
       throw 'Could not find pattern with key ' + key;
     }
 
-    /**
-     * Recursively merge properties of two objects.
-     *
-     * @param {Object} obj1 If obj1 has properties obj2 doesn't, add to obj2.
-     * @param {Object} obj2 This object's properties have priority over obj1.
-     * @returns {Object} obj2
-     */
+    
     function mergeData(obj1, obj2){
       if(typeof obj2 === 'undefined'){
         obj2 = {};
diff --git a/builder/pattern_exporter.js b/builder/pattern_exporter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/patternlab.js b/builder/patternlab.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/patternlab_grunt.js b/builder/patternlab_grunt.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/patternlab_gulp.js b/builder/patternlab_gulp.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/pseudopattern_hunter.js b/builder/pseudopattern_hunter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
diff --git a/builder/style_modifier_hunter.js b/builder/style_modifier_hunter.js
@@ -1,5 +1,5 @@
 /* 
- * patternlab-node - v0.14.0 - 2015 
+ * patternlab-node - v0.15.0 - 2015 
  * 
  * Brian Muenzenmeyer, and the web community.
  * Licensed under the MIT license. 
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.14.0",
+  "version": "0.15.0",
   "devDependencies": {
     "browser-sync": "^2.10.0",
     "del": "^2.0.2",
@@ -23,12 +23,14 @@
     "Atomic Web Design",
     "Node",
     "Grunt",
+    "Gulp",
     "Javascript"
   ],
   "repository": {
     "type": "git",
     "url": "git://github.com/pattern-lab/patternlab-node.git"
   },
+  "bugs": "https://github.com/pattern-lab/patternlab-node/issues",
   "author": "Brian Muenzenmeyer",
   "license": "MIT",
   "scripts": {
diff --git a/package.json b/package.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.14.0",
+  "version": "0.15.0",
   "devDependencies": {
     "bs-html-injector": "^3.0.0",
     "diveSync": "^0.3.0",
@@ -36,6 +36,6 @@
     "test": "grunt travis --verbose"
   },
   "engines": {
-    "node": ">=0.1 <4.0"
+    "node": ">=0.1"
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * patternlab-node - v0.14.0 - 2015`
	`2`	`+ * patternlab-node - v0.15.0 - 2015`
`3`	`3`	`*`
`4`	`4`	`* Brian Muenzenmeyer, and the web community.`
`5`	`5`	`* Licensed under the MIT license.`