Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 0f0bcb6a088f669a5c1272d238bbe79e29002742 https://github.com/galaxyproject/galaxy/commit/0f0bcb6a088f669a5c1272d238bbe... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-10-24 (Mon, 24 Oct 2016) Changed paths: M Makefile Log Message: ----------- fix bad merge in #3060 Commit: 00c48e4878a0b22ce7045692d67d72af7d540215 https://github.com/galaxyproject/galaxy/commit/00c48e4878a0b22ce7045692d67d7... Author: Martin Cech <cech.marten@gmail.com> Date: 2016-10-24 (Mon, 24 Oct 2016) Changed paths: M Makefile Log Message: ----------- remove the rest of the badle merged target Commit: 05be84ba47c0932a393cb9925ae10db4fae27396 https://github.com/galaxyproject/galaxy/commit/05be84ba47c0932a393cb9925ae10... Author: Nicola Soranzo <nsoranzo@tiscali.it> Date: 2016-10-24 (Mon, 24 Oct 2016) Changed paths: M Makefile Log Message: ----------- Merge pull request #3087 from martenson/fix-makefile fix bad merge in #3060 Compare: https://github.com/galaxyproject/galaxy/compare/5662a6a5c6fd...05be84ba47c0