Solve final merge conflict
This commit is contained in:
parent
d8896f0a9e
commit
f9ad3e5276
1 changed files with 1 additions and 1 deletions
2
dwm.c
2
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 */
|
||||
|
|
Loading…
Reference in a new issue