From bdea3c0e798e92388493de689676343f14022289 Mon Sep 17 00:00:00 2001
From: korei999 <ju7t1xe@gmail.com>
Date: Fri, 1 Dec 2023 13:45:25 +0200
Subject: [PATCH] resolved conflict

---
 config.def.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config.def.h b/config.def.h
index d291fab..7dcb908 100644
--- a/config.def.h
+++ b/config.def.h
@@ -268,7 +268,7 @@ static const Key keys[] = {
     TAGKEYS(Key_8, 7),
     TAGKEYS(Key_9, 8),
     TAGKEYS(Key_0, 9),
-    { SUPER | SHIFT,                        Key_q,                     quit,             { 0 }                       },
+    { SUPER | ALT,                          Key_q,                     quit,             { 0 }                       },
  /* Ctrl-Alt-Backspace and Ctrl-Alt-Fx used to be handled by X server */
     { WLR_MODIFIER_CTRL | WLR_MODIFIER_ALT, XKB_KEY_Terminate_Server,  quit,             { 0 }                       },
 #define CHVT(KEY, n)                                                   \