projects / htsworkflow.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 5485092 db33538)
Merge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7
authorDiane Trout <diane@caltech.edu>
Sat, 13 Dec 2014 00:36:36 +0000 (16:36 -0800)
committerDiane Trout <diane@caltech.edu>
Sat, 13 Dec 2014 00:36:36 +0000 (16:36 -0800)
commitadb29a87606f90553596cc508865617c25417506
treea9d60c816c1e3cb63d3fb2e808dcbbd8fc17f3detree | snapshot
parent54850927ec21d3d8b7fe09b72855c067a7611be7commit | diff
parentdb33538130eed7eac6d1a290b479d776074eceeecommit | diff
Merge branch 'django1.7' of mus.cacr.caltech.edu:htsworkflow into django1.7

Conflicts:
htsworkflow/submission/encoded.py

Prefer the multi line
if 'string' in object:
   del object['string']
htsworkflow/submission/encoded.py diff1 | diff2 | blob | history
htsworkflow sequencing LIMS software