From 78f7e1db58defa1e153e8a81a84983dc3aa6d53d Mon Sep 17 00:00:00 2001
From: Barbara Parson <barbara.parson@gmail.com>
Date: Sat, 22 Feb 2025 17:36:20 -0500
Subject: [PATCH 1/9] Initial commit

---
 README.md | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 README.md

diff --git a/README.md b/README.md
new file mode 100644
index 0000000000..a2beefd592
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+# My Project

From 835b474f7e3af52550efbe2c22b0eda3f60feba9 Mon Sep 17 00:00:00 2001
From: Barbara Parson <barbara.parson@gmail.com>
Date: Sat, 22 Feb 2025 17:36:39 -0500
Subject: [PATCH 2/9] Initial empty commit


From 2f6ac1659f0fae856e0d918788990c95ccb34ef0 Mon Sep 17 00:00:00 2001
From: Barbara Parson <barbara.parson@gmail.com>
Date: Sat, 22 Feb 2025 18:09:24 -0500
Subject: [PATCH 3/9] Your commit message describing the changes

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index a2beefd592..569b04f792 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,3 @@
 # My Project
+
+

From 198ce919ef0a2b5e3272524f50de37f9eb444a68 Mon Sep 17 00:00:00 2001
From: Barbara Parson <barbara.parson@gmail.com>
Date: Sat, 22 Feb 2025 19:14:29 -0500
Subject: [PATCH 4/9] Resolved merge conflict in README.md

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 17937e4181..7887789533 100644
--- a/README.md
+++ b/README.md
@@ -19,9 +19,12 @@ Output
 ```
 
 _© 2023 XYZ, Inc._
+<<<<<<< HEAD
 >>>>>>> 83026bb2b9688feea1dea289ca22efd7209440dd
 
 
 
 
 
+=======
+>>>>>>> c6a298e (Update README.md with bug fix)

From cf765ef37138be658f454d3a340802452a20a357 Mon Sep 17 00:00:00 2001
From: Barbara Parson <barbara.parson@gmail.com>
Date: Sat, 22 Feb 2025 21:20:52 -0500
Subject: [PATCH 5/9] Move README.md to bug-fix-revert branch

---
 README.md | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/README.md b/README.md
index 7887789533..17937e4181 100644
--- a/README.md
+++ b/README.md
@@ -19,12 +19,9 @@ Output
 ```
 
 _© 2023 XYZ, Inc._
-<<<<<<< HEAD
 >>>>>>> 83026bb2b9688feea1dea289ca22efd7209440dd
 
 
 
 
 
-=======
->>>>>>> c6a298e (Update README.md with bug fix)

From b69fe18b5cab6522720cf99191b67e9b6de5efd3 Mon Sep 17 00:00:00 2001
From: Barbara Parson <barbara.parson@gmail.com>
Date: Sat, 22 Feb 2025 21:26:24 -0500
Subject: [PATCH 6/9] Create README.md in bug-fix-revert branch

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 17937e4181..7a5d7fc83a 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ Output
    simple interest = p*t*r
 ```
 
-_© 2023 XYZ, Inc._
+_© 2022 XYZ, Inc._
 >>>>>>> 83026bb2b9688feea1dea289ca22efd7209440dd
 
 

From 7687805bd943622a17d1502284f58f60a53a77bb Mon Sep 17 00:00:00 2001
From: Barbara Parson <barbara.parson@gmail.com>
Date: Sat, 22 Feb 2025 21:46:27 -0500
Subject: [PATCH 7/9] Update README.md in bug-fix-revert branch

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

diff --git a/README.md b/README.md
index 7a5d7fc83a..153dc04abd 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+
 <<<<<<< HEAD
 # My Project
 

From f13b105e9f6950133eeea8b52f8cf409937bda0f Mon Sep 17 00:00:00 2001
From: Barbara Parson <barbara.parson@gmail.com>
Date: Sat, 22 Feb 2025 22:05:24 -0500
Subject: [PATCH 8/9] Update README file

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 153dc04abd..b32709793c 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,8 @@ Input:
    r, annual rate of interest
 Output
    simple interest = p*t*r
-```
+
+
 
 _© 2022 XYZ, Inc._
 >>>>>>> 83026bb2b9688feea1dea289ca22efd7209440dd
@@ -26,3 +27,4 @@ _© 2022 XYZ, Inc._
 
 
 
+

From a4db267219e13d0ed6c4068b561b33e7aaa84ee2 Mon Sep 17 00:00:00 2001
From: Barbara Parson <barbara.parson@gmail.com>
Date: Sat, 22 Feb 2025 22:08:28 -0500
Subject: [PATCH 9/9] Update README file

---
 README.md7 | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 README.md7

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
+
+
+
+
+