Skip to content
Snippets Groups Projects
Commit 7c8ff86a authored by Nallani, Abhishikth (UG - Comp Sci & Elec Eng)'s avatar Nallani, Abhishikth (UG - Comp Sci & Elec Eng)
Browse files

Merge branch 'main' into 'develop' 

# Conflicts:
#   hello.py
parents b49135f9 283958e8
No related branches found
No related tags found
1 merge request!1added how i am feeling
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 1 deletion
hello.py
+ 3
− 1
View file @ 7c8ff86a
print("Hello World") <<<<<<< hello.py
print("Hello World, Abhi")
print("I am feeling happy today") print("I am feeling happy today")
>>>>>>> hello.py
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment