fix merge conflicts - Githubissues

tourbillon-store / tourbillon

2 stars 0 forks source link

fix merge conflicts #77

Closed schai6 closed 6 years ago

schai6 commented 6 years ago

Assignee Tasks

[ ] added unit tests (or none needed)
[ ] written relevant docs (or none needed)
[ ] referenced any relevant issues (or none exist)

Fix merge conflict not saving...