projects
/
htsworkflow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
This is a partial merge of the stanford branch with the caltech branch of
[htsworkflow.git]
/
htsworkflow
/
frontend
/
eland_config
/
views.py
diff --git
a/htsworkflow/frontend/eland_config/views.py
b/htsworkflow/frontend/eland_config/views.py
index 25edea96fcaf893f4abdb8029c3ad171523daab0..d4be4ea2e082228e32ff8b7969d585fa1e7db0b8 100644
(file)
--- a/
htsworkflow/frontend/eland_config/views.py
+++ b/
htsworkflow/frontend/eland_config/views.py
@@
-4,7
+4,7
@@
from django.core.exceptions import ObjectDoesNotExist
from htsworkflow.frontend.eland_config import forms
from htsworkflow.frontend import settings
-from htsworkflow.frontend.
fctracker
import models
+from htsworkflow.frontend.
samples
import models
import os
import glob