extras/README

Pawka · Feb 23, 2011 · 0a9e5bc · 0a9e5bc
1 parent ab9c42e
commit 0a9e5bc
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/extras/README.textile b/extras/README.textile
@@ -1,8 +1,4 @@
 h2. Contents
 
-<<<<<<< HEAD
 * metanoia.zip - Great "Metanoia":http://www.fontspace.com/lutz-baar/baar-metanoia font created by Lutz Baar
 
-=======
-- metanoia.zip - Great "Metanoia":http://www.fontspace.com/lutz-baar/baar-metanoia font created by Lutz Baar
->>>>>>> a8df77d7b9a505e7985298036af317b5665086a6