From 6cb7ff8d4333f7bf574c30c9c82c6f0f6c8719de Mon Sep 17 00:00:00 2001 From: "Smith, Thomas E (PG/T - Comp Sci & Elec Eng)" <ts00738@surrey.ac.uk> Date: Fri, 14 Feb 2025 12:01:53 +0000 Subject: [PATCH] Fixed mistakes made during testing merge process --- Hello.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Hello.py b/Hello.py index 6f61e08..430a73d 100644 --- a/Hello.py +++ b/Hello.py @@ -1,6 +1,2 @@ -<<<<<<< Hello.py - -======= print("Hello World, Thomas") print("I am feeling Happy") ->>>>>>> Hello.py -- GitLab