From 3e4f0cce1ba8fba10a136b8bd225cc02abe45ecc Mon Sep 17 00:00:00 2001
From: ChristosPantelis <cpant@unimelb.edu.au>
Date: Fri, 16 Sep 2022 14:18:23 +1000
Subject: [PATCH] I created a conflict!

---
 src/cpp/helloworld.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/cpp/helloworld.cpp b/src/cpp/helloworld.cpp
index 4fd525f..a495884 100644
--- a/src/cpp/helloworld.cpp
+++ b/src/cpp/helloworld.cpp
@@ -3,5 +3,5 @@
 void main()
 {
 	int i = 10;
-	std::cout << " hello C++ world ";
-}
\ No newline at end of file
+	std::cout << " hello C++ world - conflicted version ";
+}