Commit 613ca12d authored by julian.bauer's avatar julian.bauer
Browse files

Fix conflict

parents c0e69a4d 36912751
......@@ -6,6 +6,6 @@ one = 1.0 # browser
two = 2.0 # local
three = 3. # local
three = 3.0 # local fix of conflict
print(one + two + three)
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