Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 6f5e76eecc52de175b4d48cb9c13c4c78eb39772 https://github.com/galaxyproject/galaxy/commit/6f5e76eecc52de175b4d48cb9c13c... Author: guerler <aysam.guerler@gmail.com> Date: 2017-05-24 (Wed, 24 May 2017) Changed paths: M lib/galaxy/tools/__init__.py Log Message: ----------- Fix bad merge for populate model Commit: 64d6ffd59dee8ee68b7a835b1566cca162a173db https://github.com/galaxyproject/galaxy/commit/64d6ffd59dee8ee68b7a835b1566c... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-05-24 (Wed, 24 May 2017) Changed paths: M lib/galaxy/tools/__init__.py Log Message: ----------- Merge pull request #4112 from guerler/fix_populate Fix failed merge for populate model Compare: https://github.com/galaxyproject/galaxy/compare/d7a0fdfaa748...64d6ffd59dee