Build 34 https://pharo.fogbugz.com/f/cases/close/20301/loading-of-BaselineOfIDE-must-not-resolve-conflicts-automatically
https://github.com/pharo-project/pharo/pull/190#pullrequestreview-56020044 -- Guille Polito Research Engineer French National Center for Scientific Research - *http://www.cnrs.fr* <http://www.cnrs.fr> *Web:* *http://guillep.github.io* <http://guillep.github.io> *Phone: *+33 06 52 70 66 13
