search

Epihedron / Adventurer

Adventurer webpage and assests
epihedron.com
3 stars 0 forks source link

conflict resolution - akdesign with alpha index.html #31

Closed zerske closed 10 years ago

zerske commented 10 years ago

Went through an manually resolved all the merge errors between master and origin/master. Attempting another pull request for akdesign into master.

zerske commented 10 years ago

Manual resolution wasn't pushed from my local master to origin/master. Closing, and will re-submit after that merge is complete.