From a57e72e57b736f743e0657ee32d445220b7e7e0c Mon Sep 17 00:00:00 2001
From: kevin <kevin@procolix.com>
Date: Wed, 19 Mar 2025 16:22:31 +0100
Subject: [PATCH] Rebase onto main

---
 panel/src/panel/views.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/panel/src/panel/views.py b/panel/src/panel/views.py
index 863dce4c..f875e04c 100644
--- a/panel/src/panel/views.py
+++ b/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):