summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorHarpreet2016-08-09 13:05:52 +0530
committerHarpreet2016-08-09 13:05:52 +0530
commitd8fca69f239a275f5ffdbd870508c86b6e69c678 (patch)
tree8e102f22a671d2b837c2a030911e6870e790fd41 /README.md
parent9fd2976931c088dc523974afb901e96bad20f73c (diff)
parentde5fe502b7240a48f9d46b9e210060de5c2b185e (diff)
downloadFOSSEE-Optim-toolbox-development-d8fca69f239a275f5ffdbd870508c86b6e69c678.tar.gz
FOSSEE-Optim-toolbox-development-d8fca69f239a275f5ffdbd870508c86b6e69c678.tar.bz2
FOSSEE-Optim-toolbox-development-d8fca69f239a275f5ffdbd870508c86b6e69c678.zip
Initial upload
Diffstat (limited to 'README.md')
-rw-r--r--README.md6
1 files changed, 5 insertions, 1 deletions
diff --git a/README.md b/README.md
index 0ac465e..e77723f 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,5 @@
-# fminfunctions \ No newline at end of file
+<<<<<<< HEAD
+# fminfunctions
+=======
+# intfminfunction
+>>>>>>> de5fe502b7240a48f9d46b9e210060de5c2b185e