Closed MatryoshkaLJY closed 8 months ago
"This branch cannot be rebased due to conflicts"
Not sure where the conflicts are. It doesn't mention any specific files. Can you check on your end if you are up to date with djhackersdev:master and fix that if needed?
Otherwise, I can't merge it.
Thanks for following up. Merged.
"This branch cannot be rebased due to conflicts"
Not sure where the conflicts are. It doesn't mention any specific files. Can you check on your end if you are up to date with djhackersdev:master and fix that if needed?
Otherwise, I can't merge it.