search

outofcopyright / outofcopyright-website

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

Merge in production of the Netherlands failed #65

Closed mzeinstra closed 9 years ago

mzeinstra commented 9 years ago

I tried to merge the Netherlands into production. I got the message that the merge was succesfull, but Github showed no merge was done:

screen shot 2015-01-13 at 18 00 55

jeromejesse commented 9 years ago

ok, I had a conflict on the master branch. I fixed.