Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ex3_lab3.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
print("Test")
print("")
1 change: 1 addition & 0 deletions hello.txt
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
Hello hello
test abc
8 changes: 8 additions & 0 deletions helloworld.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
print("Hello World!")
print("Hello OSS Development")
print("Hello CTU")
<<<<<<< HEAD
# print("Hello CTU - CIT")
=======
print("Hello CTU - CIT")
>>>>>>> test_functions
8 changes: 8 additions & 0 deletions helloworld.py.orig
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
print("Hello World!")
print("Hello OSS Development")
print("Hello CTU")
<<<<<<< HEAD
# print("Hello CTU - CIT")
=======
print("Hello CTU - CIT")
>>>>>>> test_functions