search

electron-userland / electron-json-storage

:package: Easily write and read user settings in Electron apps
1.44k stars 80 forks source link

Add multi-directory support #77

Closed Yoann-Pearson closed 7 years ago

Yoann-Pearson commented 7 years ago

This is a follow-up branch from a fork of PR #51 branch.

(not sure if this was the correct way to continue someone else's work...) (and also this is my first PR on github, so if I've done something unexpected or wrong, please point me in the correct direction and I'll try to fix things)

jviotti commented 7 years ago

Hi @stromboul ,

Thanks for this! The PR has conflicts, and its bringing in unrelated changed, which can be solved by rebasing master into the branch.

You can take the old PR, do git rebase master, fix any potential conflicts, and push that instead, or you can manually redo the changes from the old PR in the new master.

Let me know if I can help with anything!