Looks like develop and master aren't synced

osompress / genesis-simple-share

Plugin: Genesis Simple Share

36 stars 16 forks source link

Looks like develop and master aren't synced #61

Closed nathanrice closed 9 years ago

nathanrice commented 9 years ago

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?

NicktheGeek commented 9 years ago

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.