search

awestruct / web-editor

A web based editor for awestruct projects
8 stars 6 forks source link

Unable to pull updates for jboss-developer-site #71

Closed pmuir closed 11 years ago

pmuir commented 11 years ago

Whenever I try to pull updates, I just seem to get an endless round of merge errors. This is despite the fact that I actually have a fully up to date HEAD of the site locally.