diff options
| author | harpreetrathore | 2016-08-09 13:10:29 +0530 |
|---|---|---|
| committer | GitHub | 2016-08-09 13:10:29 +0530 |
| commit | ee7878c060936d5a0c9bb30dd154ffbc9d1dcdff (patch) | |
| tree | 316a18af0b7398aa0c4032f7a7c4f3bd09c970e4 /README.md | |
| parent | d8fca69f239a275f5ffdbd870508c86b6e69c678 (diff) | |
| download | FOSSEE-Optim-toolbox-development-ee7878c060936d5a0c9bb30dd154ffbc9d1dcdff.tar.gz FOSSEE-Optim-toolbox-development-ee7878c060936d5a0c9bb30dd154ffbc9d1dcdff.tar.bz2 FOSSEE-Optim-toolbox-development-ee7878c060936d5a0c9bb30dd154ffbc9d1dcdff.zip | |
Update README.md
Diffstat (limited to 'README.md')
| -rw-r--r-- | README.md | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -1,5 +1 @@ -<<<<<<< HEAD -# fminfunctions -======= -# intfminfunction ->>>>>>> de5fe502b7240a48f9d46b9e210060de5c2b185e +intfminfunction |