search

Cardshifter / cardshifter.github.io

Cardshifter Website
Other
7 stars 0 forks source link

Resolve conflicts and divergence between 'develop' and 'master' branches #20

Closed Phrancis closed 9 years ago

Phrancis commented 9 years ago

Due to human error the two branches have become divergent. Will work with @Zomis in order to restore it to a stable condition.

Phrancis commented 9 years ago

Commit dfae77ad fixed develop and changes were pushed to master, everything appears to be synced now.