From f9ad3e5276a7d98227acbf1b8701a0fcce7d19ef Mon Sep 17 00:00:00 2001
From: lhark <lhark@lharktop>
Date: Tue, 21 Mar 2017 12:22:02 -0400
Subject: [PATCH] Solve final merge conflict

---
 dwm.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dwm.c b/dwm.c
index 275a67c..b8e839e 100644
--- a/dwm.c
+++ b/dwm.c
@@ -78,7 +78,7 @@
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
 enum { SchemeNorm, SchemeSel, SchemeLast }; /* color schemes */
-enum { NetSupported, NetWMName, NetWMState,
+enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
        NetSystemTray, NetSystemTrayOP, NetSystemTrayOrientation, NetSystemTrayOrientationHorz,
        NetWMFullscreen, NetActiveWindow, NetWMWindowType,
        NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */