15 Dec
2013
15 Dec
'13
3:38 p.m.
Marek,
when merging next into master you will hit a number of conflicts (as you already realized). Here you have the diff showing how I solved them.
I hope it can help.
Cheers,
--
Antonio Quartulli