Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

#12: Merge global and local config #13

Merged
kriskbx merged 2 commits into from
Aug 15, 2017
Merged

#12: Merge global and local config #13

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd0e6be
#12: Merge global and local config
attiks Aug 15, 2017
68e038b
#12: Use method
attiks Aug 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
#12: Use method
  • Loading branch information
@attiks
attiks committed Aug 15, 2017
commit 68e038b6cf1a6cc5041cce4da0a88a57936dbfb0
2 changes: 1 addition & 1 deletion include/file-config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class fileConfig extends config {
*/
parseLocal() {
try {
let global = yaml.sync(this.global, {});
let global = this.parseGlobal();
let local = yaml.sync(this.local, {});
return extend(global, local);
} catch (e) {
Expand Down