From 470a74388fa2cdeb46d783df3955fc298a76a6a3 Mon Sep 17 00:00:00 2001
From: Anh-Thy04 <anhthytran2309@gmail.com>
Date: Thu, 19 Jun 2025 21:27:56 +0200
Subject: [PATCH] Update views.py

---
 application/dashboard/views.py | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/application/dashboard/views.py b/application/dashboard/views.py
index 955bbfe..fd55086 100644
--- a/application/dashboard/views.py
+++ b/application/dashboard/views.py
@@ -24,17 +24,10 @@ def dashboard():
         .limit(50)
         .all()
     )
-<<<<<<< Updated upstream
-    form = npForm()
-    return render_template(
-        "dashboard.html", plates=Plates, logs=logs, form=form
-    )
-=======
     form = npForm() 
     #LogID = LoggedItem.query.all()
     id = LoggedItem.id
     return render_template("dashboard.html", plates=Plates, logs=logs, form=form, id=id)
->>>>>>> Stashed changes
 
 
 @dash_blueprint.route("/add", methods=["GET", "POST"])