search

YoungMaker / iORC

iORC - Organized Roleplay Creator
3 stars 0 forks source link

apolloModule and detailPanes #50

Closed hwilling closed 6 years ago

hwilling commented 6 years ago

pull request for merging the apolloModule and detailPanes branches. Conflicts exist between the two.

hwilling commented 6 years ago

The conflict was inside of the gradle.build file resolved by combining the differences and including the plugins from both branches

l-hurd314 commented 6 years ago

I reviewed and I sign off on the merge.