From 7ebc5f5630ad0b3935c169671404f8463a6ad04d Mon Sep 17 00:00:00 2001
From: Abdelhak Bougouffa <abougouffa@cryptolab.net>
Date: Thu, 16 Jul 2015 00:20:56 +0100
Subject: [PATCH] Update README.md

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

diff --git a/README.md b/README.md
index 6c6c8cf..19dd454 100644
--- a/README.md
+++ b/README.md
@@ -5,13 +5,8 @@ pyIslam
 pyIslam is a python library to calculate prayer times and convert between gregorian and hijri.
 Actually, the library can does:
 
-<<<<<<< HEAD
-    *Pray times calculation
-    *Hijri/Gregorian date conversion
-    *Qibla direction
-=======
 * Pray times calculation
-* Hijri/Gregorian date convertion
+* Hijri/Gregorian date conversion
 * Qibla direction
 
 
@@ -20,4 +15,3 @@ pyIslam<br>
 -حساب مرات الصلوات<br>
 - التحويل بين الهجري و الميلادي<br>
 - تحديد  اتجاه القبلة<br>
->>>>>>> a29ace647c15cc34847e1b0a0d85caaf32f2eb06