diff --git a/Hello.py b/Hello.py index caeaee1b3bd1dfc883d75ac0ad93919314bba823..6f61e087cf9bb535cba3e7673bc870f6c5d3cfbc 100644 --- a/Hello.py +++ b/Hello.py @@ -1 +1,6 @@ +<<<<<<< Hello.py + +======= print("Hello World, Thomas") +print("I am feeling Happy") +>>>>>>> Hello.py