I'm assuming some stuff went into master that was supposed to go into develop ... can someone take a look at this PR and see if anything looks like it shouldn't be synced?
That should all be good to merge to develop. Most of it originated from develop but the code conflicts weren't correctly resolved so it showed them as out of sync when technically they were in sync.
I'm assuming some stuff went into
master
that was supposed to go intodevelop
... can someone take a look at this PR and see if anything looks like it shouldn't be synced?