From 6a8eff14ac47429763679513bb06dd194230c759 Mon Sep 17 00:00:00 2001
From: ang-st <pg@tulip.(none)>
Date: Mon, 30 Mar 2015 22:06:57 +0100
Subject: [PATCH] readme

---
 README.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/README.md b/README.md
index 1d3e889..3280170 100644
--- a/README.md
+++ b/README.md
@@ -1,10 +1,2 @@
-<<<<<<< HEAD
 #kitteh wiki
-simple wiki for thsf site
-
-
-=======
-###wiki tshf 
-
 this is thsf wiki, all datas here are public.
->>>>>>> 22a89ddac499fcafc0cabd1b0df2a39b6bd794ac