summaryrefslogtreecommitdiff
path: root/config.def.h
diff options
context:
space:
mode:
Diffstat (limited to 'config.def.h')
-rw-r--r--config.def.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/config.def.h b/config.def.h
index f318988..2c53956 100644
--- a/config.def.h
+++ b/config.def.h
@@ -80,7 +80,12 @@ static const Rule rules[] = {
/* layout(s) */
static const float mfact = 0.50; /* factor of master area size [0.05..0.95] */
static const int nmaster = 1; /* number of clients in master area */
+<<<<<<< HEAD
static const int resizehints = 0; /* 1 means respect size hints in tiled resizals */
+=======
+static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */
+static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */
+>>>>>>> origin/master
static const Layout layouts[] = {
/* symbol arrange function */