From 365064be38dcbdc64b4f0216ee443c875d40155c Mon Sep 17 00:00:00 2001
From: "Young, Will W (PG/T - Comp Sci & Elec Eng)" <wy00148@surrey.ac.uk>
Date: Fri, 14 Feb 2025 12:01:50 +0000
Subject: [PATCH] Update hello.py

---
 hello.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hello.py b/hello.py
index 547763a..387e56a 100644
--- a/hello.py
+++ b/hello.py
@@ -1,4 +1,2 @@
-<<<<<<< hello.py
-print('hey there guys, its jeff, im scared of you')
 
->>>>>>> hello.py
+print('hey there guys, its jeff, im scared of you')
-- 
GitLab