> #include<yade/pkg-common/GravityEngines.hpp> > +<<<<<<< TREE > +//#include<yade/pkg-dem/HydraulicForceEngine.hpp> > +======= > // #include<yade/pkg-dem/HydraulicForceEngine.hpp> > +>>>>>>> MERGE-SOURCE > #include<yade/pkg-dem/NewtonIntegrator.hpp>
Thanks for your changes. Please make sure you don't comit local conflicts (above). They are shown when you update or with "bzr st". I fix it here and will commit soon. v _______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
