Merge branch 'main' into 'develop'

# Conflicts: # Hello.py

Merge branch 'main' into 'develop'
9d28fc37 · Kadamattuparambil Suresh, Arjun (PG/T - Comp Sci & Elec Eng) · b430a00e · 41f65fd3 · 9d28fc37
Commit 9d28fc37 authored 4 months ago by Kadamattuparambil Suresh, Arjun (PG/T - Comp Sci & Elec Eng)
--- a/Hello.py
+++ b/Hello.py
-print ("Hellow World")
+<<<<<<< Hello.py
 print ("nothing,how about you")
+print ("Hellow World,Arjun")
+>>>>>>> Hello.py