outofcopyright / outofcopyright-website

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

Merge in production failing for Germany #75

Closed mzeinstra closed 9 years ago

mzeinstra commented 9 years ago

I get a positive reply in the editor but see no change on github. What is going on? screen shot 2015-01-27 at 18 14 09

jeromejesse commented 9 years ago

The conflict is not detect by the application. I have resolve the conflict now, the problem is a branch bad init.