Hi Erik, yes, I get on this during this week. Thanks for pointing this out.
Philipp On Jun 16, 2014, at 9:07 AM, Erik Schnetter <[email protected]> wrote: > During today's telecon we realized that Carpet's branch "pmoesta/staggered" > should be merged into the master branch. > > Prior to doing so, could you (the maintainers of pmoesta/staggered) merge > Carpet's master branch into the staggered branch, resolve the conflicts, and > test that everything still works fine? Afterwards, merging pmoesta/staggered > into the master will be trivial. This moves the burden of merging to the > branch, where it is less disruptive, and where one can break down the merging > into multiple commits, and test without time pressure. > > -erik > > -- > Erik Schnetter <[email protected]> > http://www.perimeterinstitute.ca/personal/eschnetter/ > > My email is as private as my paper mail. I therefore support encrypting > and signing email messages. Get my PGP key from http://pgp.mit.edu/. > > _______________________________________________ > Users mailing list > [email protected] > http://lists.einsteintoolkit.org/mailman/listinfo/users _______________________________________________ Users mailing list [email protected] http://lists.einsteintoolkit.org/mailman/listinfo/users
