Merge pull request #101 from scottnath/hotfix/missing-config

merged missing config
punchcard-cms · Sep 8, 2016 · 830b649 · 830b649
2 parents adffae1 + 48159bf
commit 830b649
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/content-types.js b/lib/content-types.js
@@ -44,7 +44,7 @@ const merged = (content, config) => {
   let mergedTypes = _.cloneDeep(content);
 
   if (content) {
-    return merge(mergedTypes);
+    return merge(mergedTypes, config);
   }
 
   return raw(config).then(types => {