From ee7878c060936d5a0c9bb30dd154ffbc9d1dcdff Mon Sep 17 00:00:00 2001
From: harpreetrathore
Date: Tue, 9 Aug 2016 13:10:29 +0530
Subject: Update README.md

---
 README.md | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/README.md b/README.md
index e77723f..a71e086 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1 @@
-<<<<<<< HEAD
-# fminfunctions
-=======
-# intfminfunction
->>>>>>> de5fe502b7240a48f9d46b9e210060de5c2b185e
+intfminfunction
-- 
cgit