Skip to content

Commit 1f34338

Browse files
committed
Resolve merge conflict in README.md
1 parent ad95b0a commit 1f34338

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

README.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
1+
2+
# coding-project-template
3+
=======
14
# Introduction to Git and GitHub
25

36
## Simple Interest Calculator
@@ -13,4 +16,4 @@ Output
1316
simple interest = p*t*r
1417
```
1518

16-
_© 2022 XYZ, Inc._
19+
_© 2023 XYZ, Inc._

0 commit comments

Comments
 (0)