Prefer user settings during tools merge#774

Merged

gohabereg merged 4 commits intorelease/2.14from fix/tools-merge

May 21, 2019

+14-9

Commits on May 20, 2019

Prefer user settings during tools merge

gohabereg
authored and
georgyb
committed
Simplify code

gohabereg
authored and
georgyb
committed
Merge branch 'release/2.14' of https://github.com/codex-team/codex.editor into fix/tools-merge
georgyb
committed
Add changelog
georgyb
committed