Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 0924891e31f3f215323fe7030e0d6c167f596878 https://github.com/galaxyproject/galaxy/commit/0924891e31f3f215323fe7030e0d6... Author: John Chilton <jmchilton@gmail.com> Date: 2015-12-04 (Fri, 04 Dec 2015) Changed paths: M test/qunit/test-common.js Log Message: ----------- Fix up merge issue with double underscore shim. Commit: f7a2acdcabdfb0d2368e00c4959712bf7d5c98f2 https://github.com/galaxyproject/galaxy/commit/f7a2acdcabdfb0d2368e00c495971... Author: Martin Cech <cech.marten@gmail.com> Date: 2015-12-05 (Sat, 05 Dec 2015) Changed paths: M test/qunit/test-common.js Log Message: ----------- Merge pull request #1246 from jmchilton/test-commons Fix up merge issue with double underscore shim. Compare: https://github.com/galaxyproject/galaxy/compare/9f8eb465e718...f7a2acdcabdf