Closed mahcsig closed 8 years ago
Switched branches from #104. There were a couple other changes in master not in develop, I didn't squash those with mine.
You probably need to rebase, the branch cannot be merged.
change branch again
Switched branches from #104. There were a couple other changes in master not in develop, I didn't squash those with mine.