From cb8ebf3939b8123bfd4ecd1e8003b0013726cf09 Mon Sep 17 00:00:00 2001
From: FreeArtMan <freeartman@wechall.net>
Date: Fri, 11 Jul 2014 13:48:41 +0300
Subject: updated README

---
 README.md | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 508e259..223713f 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,20 @@
-<<<<<<< HEAD
-Here is dwm 6.1 for with applied patches:
+# DWM-FANCY #
+
+dwm fancy if fork of dwm with some small additions
+to make dwm expirience more enjoyable. Added support
+of menuconfig to turn on/off patches. Now only
+3 patches that gives moves dwm expirience from 4 star to 5 star
+
+## Applied patches ##
+### branch 6.0 ###
+pertag
+pango
+systemtray
+### branch 6.1 ###
 pertag
-?opacity
-?pango
 systemtray
 
+## Menuconfig ##
 All patches can be turned off/on with menuconfig. Configuration
 utility mconf can be taken from linux kernel. For succesfully
 compile all sources mconf isnt needed.
-=======
-dwm-fancy
-=========
-
-fork of dwm 6.1 with patchs applied and added kernel menuconfig configuration
->>>>>>> 41fe4babc896a28ea5e08230762cdecd9772de73
-- 
cgit v1.2.3