Skip to content

G
git-rebase-ticket-test
Commit dd30b2f9 authored by yevgeniy's avatar yevgeniy
Browse files
Options

local changes 1 2

parent 99f72318
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
main.py
View file @ dd30b2f9
...@@ -5,4 +5,6 @@ print("Change for testing merge") ...@@ -5,4 +5,6 @@ print("Change for testing merge")
print("change 1") print("change 1")
print("change 2") print("change 2")
print("change 3") print("change 3")
print("change 4") print("change 4")
\ No newline at end of file print("change local change 1")
print("change local change 2")
\ No newline at end of file
Markdown is supported
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