Closed Franzelfx closed 4 years ago
@Franzelfx can you make a rebase?
git pull -r origin master
If there are conflicts you can use some merge tool, like meld https://meldmerge.org/
If you need any help contact me at slack, we can have a call to solve it.
I made this procedure and create a new pull request, can you check that everything is ok?
https://github.com/popsolutions/openventilator/pull/15
@Franzelfx can you make a rebase?
git pull -r origin master
If there are conflicts you can use some merge tool, like meld https://meldmerge.org/
If you need any help contact me at slack, we can have a call to solve it.