aboutsummaryrefslogtreecommitdiff
path: root/dminiwm.c
diff options
context:
space:
mode:
authorIvan Kanakarakis <ivan.kanak@gmail.com>2011-11-26 11:40:55 +0200
committerIvan Kanakarakis <ivan.kanak@gmail.com>2011-11-26 11:40:55 +0200
commit48e04fe01ded12663fd83c8ccb1c502433cf8d63 (patch)
treebad95f9e7c50968018249132c4c65277fbf68e3c /dminiwm.c
parentd31b4dd20f8699fa9a1b13c17aaa1c8c83005b7c (diff)
add CLICK_TO_FOCUS option in config.h
Diffstat (limited to 'dminiwm.c')
-rw-r--r--dminiwm.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/dminiwm.c b/dminiwm.c
index 22cbd9d..d25f05b 100644
--- a/dminiwm.c
+++ b/dminiwm.c
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-/* dminiwm.c [ 0.1.7 ]
-=======
/* dminiwm.c [ 0.1.8 ]
->>>>>>> mirror
*
* I started this from catwm 31/12/10
* Bad window error checking and numlock checking used from