search

outofcopyright / outofcopyright-website

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

Merge in production does not work #50

Closed mzeinstra closed 9 years ago

mzeinstra commented 9 years ago

I tried to merge test-land in production. We webpage keeps loading and now merge occurs.

jeromejesse commented 9 years ago

I haved a conflict with master and I have resolve manually. Probably my fault because I have updated the master translation. Always update only child and merge branches in master.