forked from Fediversity/Fediversity
cleanup more in views.py
This commit is contained in:
parent
a57e72e57b
commit
7d34469627
1 changed files with 1 additions and 3 deletions
|
@ -9,10 +9,8 @@ from django.contrib.auth.models import User
|
|||
from django.views.generic import TemplateView, DetailView
|
||||
from django.views.generic.edit import FormView
|
||||
|
||||
<<<<<<< HEAD
|
||||
from panel import models, settings
|
||||
=======
|
||||
>>>>>>> caef7e7 (cleanup debugmess in views.py)
|
||||
from panel import models
|
||||
from panel.configuration import forms
|
||||
|
||||
class Index(TemplateView):
|
||||
|
|
Loading…
Add table
Reference in a new issue