Update README.md

abougouffa · Jul 15, 2015 · 7ebc5f5 · 7ebc5f5
1 parent a950d7e
commit 7ebc5f5
Showing 1 changed file with 1 addition and 7 deletions.
diff --git 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