Hi

I have a question.
Imagine the following scenario.
        - jannik used 11005 to remove heading. In his version morphic has the  
class Presenter as well as methods in other classes related to etoys.
        - in 11010 we remove Presenter and other methods.

        - now in 11030 I'm merging Jannik changes and
        I do not understand why Presenter and the methods that were remove in  
11010 are not in conflicts.
        I see just that Presenter and the methods removed are added again.
        Did I miss something obvious?

Stef

_______________________________________________
Pharo-project mailing list
[email protected]
http://lists.gforge.inria.fr/cgi-bin/mailman/listinfo/pharo-project

Reply via email to