Skip to content
Closed
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
7 changes: 7 additions & 0 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,14 @@


def always_returns_true():
var = "This is a change!"
<<<<<<< HEAD
return False
list = ["tomato", "balloon"]
=======
return None

>>>>>>> 10b0a03de82ba4911c9786b37e78f94fd5e47680


def test_always_returns_true():
Expand Down