search

PlayWithMagic / PlayWithMagic.org

PlayWithMagic.org is a web application that catalogs magic tricks and helps magicians build shows.
http://playwithmagic.github.io/PlayWithMagic.org/
Apache License 2.0
2 stars 1 forks source link

Master Branch got fubarred by a bad merge #210

Closed pkarjala closed 9 years ago

pkarjala commented 9 years ago

For some reason the merge made into Master from Milestone 3 at 8862e87 completely borked the application. We're doing a manual diff and merge after attempts to fix the application by reverting the git commit were unsuccessful.

pkarjala commented 9 years ago

Should now be fixed and working!