This is a partial merge of the stanford branch with the caltech branch of

[htsworkflow.git] / htsworkflow / frontend / analysis / main.py

diff --git a/htsworkflow/frontend/analysis/main.py b/htsworkflow/frontend/analysis/main.py
index 015a69c823503435c3eb2dfd98a3fbff1937edc2..511390b6d8bc9ae5fdc6ebd7a72afb98ce338287 100644 (file)
--- a/htsworkflow/frontend/analysis/main.py
+++ b/htsworkflow/frontend/analysis/main.py
@@ -3,8 +3,8 @@ from django.http import HttpResponse
 from datetime import datetime
 from string import *
 import re
-from htswfrontend import settings
-from htswfrontend.analys_track.models import Task, Project
+from htsworkflow.frontend import settings
+from htsworkflow.frontend.analysis.models import Task, Project
 from django.core.exceptions import ObjectDoesNotExist
 
 def updStatus(request):