Feb. 10, 2015
8:04 p.m.
Le 10/2/15 20:34, Sean P. DeNigris a écrit :
Sean P. DeNigris wrote
Fix in inbox: SLICE-Issue-4795-Horizontal-wheel-SeanDeNigris.1 Merging into 40486 there are two merge conflict in Athens-Morphic and TxText-Athens. Use the incoming version for both. Should I do so and resubmit a v. 2?
yes please because you should not expect one guy not knowing what you did to really do a better merge than you the original author. Stef
----- Cheers, Sean -- View this message in context: http://forum.world.st/FIX-Issue-4795-Horizontal-wheel-tp4805005p4805008.html Sent from the Pharo Smalltalk Developers mailing list archive at Nabble.com.