search

mint-n-pepper / DanceBotsEditor

Qt GUI to edit Dancebot Choreographies
https://www.dancebots.ch
GNU General Public License v3.0
4 stars 1 forks source link

Fixes merge conflicts and typos #82

Closed r-oung closed 3 years ago

r-oung commented 3 years ago
philippReist commented 3 years ago

Looks good to me - thank you! Looks like you need to rebase but please merge after you do so!

r-oung commented 3 years ago

I don't really understand what you mean: rebase on which branch?

I've created another PR to merge the fix into the develop branch. You can rebase develop with master afterwards. So you can forget about this.