From 24e6ed5cf7c8fe9ccfaf4d629e842ed6ebac520a Mon Sep 17 00:00:00 2001
From: ale <ale@incal.net>
Date: Sun, 24 Mar 2024 20:34:14 +0000
Subject: [PATCH] Clean up merge mistake
---
ui/templates/inc/page.html | 4 ----
1 file changed, 4 deletions(-)
diff --git a/ui/templates/inc/page.html b/ui/templates/inc/page.html
index 39870c1..ca5d819 100644
--- a/ui/templates/inc/page.html
+++ b/ui/templates/inc/page.html
@@ -33,12 +33,8 @@
{{end}}
{{define "header_login"}}{{template "header" .}}
-<<<<<<< HEAD
- <body class="d-flex align-items-center py-4 bg-body-tertiary vh-100">
-=======
<body>
<div class="d-flex align-items-center py-4 bg-body-tertiary vh-100">
->>>>>>> 0f7aea3 (Replace Bootstrap with Material Design For Bootstrap)
<main class="form-signin w-50 m-auto">
<div class="d-flex flex-row">
--
GitLab