diff options
Diffstat (limited to 'src/dminiwm.c')
| -rw-r--r-- | src/dminiwm.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/dminiwm.c b/src/dminiwm.c index d25f05b..22cbd9d 100644 --- a/src/dminiwm.c +++ b/src/dminiwm.c @@ -1,4 +1,8 @@ +<<<<<<< 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 |