This commit is contained in:
ang-st 2015-03-30 22:06:57 +01:00
parent 2c6746c0a9
commit 6a8eff14ac

View File

@ -1,10 +1,2 @@
<<<<<<< HEAD
#kitteh wiki
simple wiki for thsf site
=======
###wiki tshf
this is thsf wiki, all datas here are public.
>>>>>>> 22a89ddac499fcafc0cabd1b0df2a39b6bd794ac