Skip to content
Snippets Groups Projects
Commit ab725206 authored by Soe Naing, Mon Yee Soe Naing (PG/T - Comp Sci & Elec Eng)'s avatar Soe Naing, Mon Yee Soe Naing (PG/T - Comp Sci & Elec Eng)
Browse files

merge conflict

parents 33a5d992 f9e3be27
No related branches found
No related tags found
1 merge request!2Main
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 2 deletions
Hello.py
+ 1
− 2
View file @ ab725206
print("Hello World!, this is from develop") print("Hello World, Alice!")
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