Skip to content
Snippets Groups Projects
Commit 5732885f authored by Jonathan Seguin's avatar Jonathan Seguin
Browse files

Fix mistake while merge with master

parent 85126bde
No related branches found
No related tags found
1 merge request!24Resolve "Keep logs of activity on a dataset"
......@@ -12,7 +12,7 @@ from django.utils.translation import ugettext_lazy as _
from django.views.generic import (CreateView, DeleteView, DetailView,
TemplateView, UpdateView)
from portal.forms import DataSetForm
from portal.forms import DataSetForm, DataSetDisplayFieldsForm
from portal.models import DataFile, DataSet, Lab, Profile, ShareGroup
from portal.views import (ActivePageViewMixin, AjaxDatatableBackboneMixin,
CreateViewMixin, DeleteViewMixin, JSONListView,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment