https://bugzilla.wikimedia.org/show_bug.cgi?id=38628
--- Comment #16 from Matthias Mullie <mmul...@wikimedia.org> 2012-08-13 12:23:20 UTC --- Indeed. Merge conflict should be fixed now. -- Configure bugmail: https://bugzilla.wikimedia.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are on the CC list for the bug. _______________________________________________ Wikibugs-l mailing list Wikibugs-l@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
