Skip to content
Snippets Groups Projects
Commit f07ebba8 authored by Tercjak, Natalia (UG - Comp Sci & Elec Eng)'s avatar Tercjak, Natalia (UG - Comp Sci & Elec Eng)
Browse files

Merge branch 'main' into 'develop' 

# Conflicts:
#   Hello.py
parents 2733edb2 615a5bd4
No related branches found
No related tags found
No related merge requests found
Pipeline #69158 canceled with stages
in 0 seconds
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 0 deletions
Hello.py
+ 3
− 0
View file @ f07ebba8
<<<<<<< Hello.py
print("Hello World)
print("I am feeling hungry today")
print("Hello World, Natalia")
>>>>>>> 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