search

outofcopyright / outofcopyright-website

Website components for OutOfCopyright.eu
http://outofcopyright.eu
Other
0 stars 2 forks source link

Merge in production is not working #20

Closed mzeinstra closed 9 years ago

mzeinstra commented 9 years ago

I clicked merge in production for test-land.

It does not seem to work as no merge action was recorded on github.

screen shot 2014-12-03 at 10 19 48

jeromejesse commented 9 years ago

I have resolve the problem. We have generate a conflict with the manual change of file yesterday.