oops
This commit is contained in:
parent
3b433415fa
commit
7ba3fd06d3
1 changed files with 0 additions and 4 deletions
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue