From 7d34469627de45a508d381f8bc2491f4b8a20f64 Mon Sep 17 00:00:00 2001
From: kevin <kevin@procolix.com>
Date: Wed, 19 Mar 2025 16:25:07 +0100
Subject: [PATCH] cleanup more in views.py

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

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