How I am feeling (!1) · Merge requests · Lin, Michelle V (PG/T - Comp Sci & Elec Eng) / git-intro · GitLab

Snippets Groups Projects

Merged Lin, Michelle V (PG/T - Comp Sci & Elec Eng) requested to merge develop into main 5 months ago

Viewing commit 58e4d5e3

Show latest version

2 files

+ 8

− 46

Files

2

58e4d5e3

Merge branch 'main' into 'develop' · 58e4d5e3
Lin, Michelle V (PG/T - Comp Sci & Elec Eng) authored 5 months ago
```
# Conflicts:
#   Hello.py
```

+ 2

− 1

print("Hello World")
print("Hello World")
print("I am feeling happy today")
print("I am feeling happy today")
\ No newline at end of file
print("Hello World, Michelle")