2015-02-10 20:34 GMT+01:00 Sean P. DeNigris <[email protected]>: > 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 resubmit a slice without the change on AthensSceneView and TxTextEditorMorph and open two new issues (one for Athens and one for TxText) - or I do it. And I'll fix it in athens and txtext. nicolai > > > > ----- > 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. > >
