From 48e04fe01ded12663fd83c8ccb1c502433cf8d63 Mon Sep 17 00:00:00 2001
From: Ivan Kanakarakis <ivan.kanak@gmail.com>
Date: Sat, 26 Nov 2011 11:40:55 +0200
Subject: add CLICK_TO_FOCUS option in config.h

---
 dminiwm.c | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'dminiwm.c')

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
-- 
cgit v1.3.1