From: Diane Trout Date: Tue, 10 Dec 2013 00:30:05 +0000 (-0800) Subject: Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4 X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=htsworkflow.git;a=commitdiff_plain;h=63bdcf938eb8a421d188287cda4109495b90679d;hp=573fb14500e40a32c03bd3734ada296da769b884 Merge branch 'django1.4' of mus.cacr.caltech.edu:htsworkflow into django1.4 --- diff --git a/htsworkflow/submission/submission.py b/htsworkflow/submission/submission.py index 6268970..c5a3f34 100644 --- a/htsworkflow/submission/submission.py +++ b/htsworkflow/submission/submission.py @@ -348,6 +348,8 @@ class Submission(object): 'Small RNA (non-multiplexed)',] paired = ['Barcoded Illumina', 'Multiplexing', + 'NEBNext Multiplexed', + 'NEBNext Small RNA', 'Nextera', 'Paired End (non-multiplexed)', 'Dual Index Illumina',]