# HG changeset patch
# User Stiletto <blasux@blasux.ru>
# Date 1396457360 -14400
# Node ID 16039d3a6270a14ce470d33f592bed798b4b3e38
# Parent  e8a43c5bbc461e64dcb7a01f8db58b7840bcfe66
Fix broken merge

diff -r e8a43c5bbc46 -r 16039d3a6270 dwm.c
--- a/dwm.c	Wed Apr 02 20:43:22 2014 +0400
+++ b/dwm.c	Wed Apr 02 20:49:20 2014 +0400
@@ -140,26 +140,6 @@
 	void (*arrange)(Monitor *);
 } Layout;
 
-struct Monitor {
-	char ltsymbol[16];
-	float mfact;
-	int nmaster;
-	int num;
-	int by;               /* bar geometry */
-	int mx, my, mw, mh;   /* screen size */
-	int wx, wy, ww, wh;   /* window area  */
-	unsigned int seltags;
-	unsigned int sellt;
-	unsigned int tagset[2];
-	Bool showbar;
-	Bool topbar;
-	Client *clients;
-	Client *sel;
-	Client *stack;
-	Monitor *next;
-	Window barwin;
-	const Layout *lt[2];
-};
 
 typedef struct {
 	const char *class;
@@ -308,6 +288,7 @@
 struct Monitor {
 	char ltsymbol[16];
 	float mfact;
+	int nmaster;
 	int num;
 	int by;               /* bar geometry */
 	int mx, my, mw, mh;   /* screen size */