Fix conflicts 🥰

This commit is contained in:
Anas Elgarhy 2022-07-16 09:03:29 +02:00
parent 62deba6b98
commit 11b78b17b6

1
dwm.c
View file

@ -277,6 +277,7 @@ static void autostart_exec(void);
/* variables */
static const char broken[] = "broken";
static Systray *systray = NULL;
static char stext[256];
static int screen;
static int sw, sh; /* X display screen geometry width, height */