fix conflict.
commita57deb6c2db991bdf9411f3782a49fa0129f8268
authorLukas Mueller <lam87@cornell.edu>
Wed, 11 Apr 2018 18:02:52 +0000 (11 14:02 -0400)
committerLukas Mueller <lam87@cornell.edu>
Wed, 11 Apr 2018 18:02:52 +0000 (11 14:02 -0400)
tree18d635997b8583b9440ea158973b4b6d91a16ce0
parent50ca977818c8abdf74e32433a8eba6838ab72436
fix conflict.
lib/CXGN/Tools/Run/Plugin/Slurm.pm