diff --git a/README.md b/README.md index b103466139..b32709793c 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,9 @@ + +<<<<<<< HEAD +# My Project + + +======= # Introduction to Git and GitHub ## Simple Interest Calculator @@ -11,6 +17,14 @@ Input: r, annual rate of interest Output simple interest = p*t*r -``` + + _© 2022 XYZ, Inc._ +>>>>>>> 83026bb2b9688feea1dea289ca22efd7209440dd + + + + + + diff --git a/README.md7 b/README.md7 new file mode 100644 index 0000000000..301c833da2 --- /dev/null +++ b/README.md7 @@ -0,0 +1,28 @@ + +<<<<<<< HEAD +# My Project + + +======= +# Introduction to Git and GitHub + +## Simple Interest Calculator + +A calculator that calculates simple interest given principal, annual rate of interest and time period in years. + +``` +Input: + p, principal amount + t, time period in years + r, annual rate of interest +Output + simple interest = p*t*r +``` + +© 2022 XYZ, Inc._ +>>>>>>> 83026bb2b9688feea1dea289ca22efd7209440dd + + + + +