Skip to content
Snippets Groups Projects
Commit 24e6ed5c authored by ale's avatar ale
Browse files

Clean up merge mistake

parent 884f110f
No related branches found
No related tags found
1 merge request!6Draft: Replace Bootstrap with Material Design For Bootstrap
Pipeline #65808 passed
Stage: test
Stage: build
Show whitespace changes
Inline Side-by-side
ui/templates/inc/page.html
+ 0
− 4
View file @ 24e6ed5c
......@@ -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">
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment