Closed damaki closed 3 years ago
@Fabien-Chouteau I've just noticed that this PR is including two of your commits that implemented the template system. I updated and branched off community-2020
when I rebased my changes a couple of days ago, but these commits no longer seem to be on community-2020
. Were these commits recently removed from the branch?
Hello @damaki,
Were these commits recently removed from the branch?
This is my fault, I will fix it ASAP.
@damaki It's done.
@Fabien-Chouteau thanks for fixing those commits on the community-2020
branch. FYI I have rebased (and force-pushed) my changes in this PR onto the updated branch.
Hello @damaki, you have to rebase your changes.
Thanks @Fabien-Chouteau , I've rebased my changes and resolved the conflict where we had both fixed the line endings problem in support/files_holder.py
(I've removed my change in favour of yours).
Thank you @damaki we will review the code and get back to you as soon as possible.
The PR is merged, thank you @damaki !
This is a resubmission of #39 with the following updates:
I've also squashed all changes into a single commit.