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