From 7ba3fd06d381d3e07ed3031e9e548665642fe203 Mon Sep 17 00:00:00 2001
From: NishiOwO <nishi@nishi.boats>
Date: Fri, 21 Nov 2025 20:38:00 +0900
Subject: [PATCH] oops

---
 mdm/login.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/mdm/login.c b/mdm/login.c
index dfee851..f6ed18d 100644
--- a/mdm/login.c
+++ b/mdm/login.c
@@ -190,11 +190,7 @@ void login_window(void) {
 
 	root = MwCreateWidget(NULL, "root", NULL, 0, 0, 0, 0);
 
-<<<<<<< HEAD
-	window	  = MwVaCreateWidget(MwWindowClass, "login", root, (x_width() - 366) / 2, (x_height() - (183 + 32 + 5)) / 2, 366, 183 + 32 + 5,
-=======
 	window	  = MwVaCreateWidget(MwWindowClass, "login", root, (x_width() - 366) / 2, (x_height() - 183) / 2, 366, 183,
->>>>>>> 5ae06b1 (fix)
 				     MwNtitle, "login",
 				     NULL);
 	p	  = config_picture == NULL ? NULL : MwLoadImage(window, config_picture);