diff options
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 |