https://bugzilla.wikimedia.org/show_bug.cgi?id=38989
Alex Monk (Krenair) <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|ASSIGNED |RESOLVED Resolution|--- |FIXED --- Comment #6 from Alex Monk (Krenair) <[email protected]> --- I didn't get around to finding ways to (where possible) automatically resolve such conflicts, but this has now been merged anyway. -- You are receiving this mail because: You are on the CC list for the bug. _______________________________________________ Wikibugs-l mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
