Fix conflict

613ca12d · julian.bauer · c0e69a4d · 36912751 · 613ca12d
Commit 613ca12d authored Jul 24, 2020 by julian.bauer
--- a/main.py
+++ b/main.py
@@ -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)