Rebase onto main

panel/src/panel/views.py

@@ -1,7 +1,6 @@
 from enum import Enum
 import json
 import subprocess
-import threading
 import os
 
 from django.urls import reverse_lazy
@@ -10,7 +9,10 @@ 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.configuration import forms
 
 class Index(TemplateView):