Closed lucfons closed 4 years ago
@lucfons - about the merge conflicts. Have you ever resolved those? It shouldn't be too bad... they're caused because Qordobacode:master
has changes that lucfons:master
doesn't have. Sometimes git can figure out what wins, but not here. Do you think you can resolve them?
closes #3