Commit fc6f8091 authored by Jack Pink's avatar Jack Pink
Browse files

fixed merge conflicts

parents 76dc369c d0f54563
......@@ -3,3 +3,5 @@ def inches_to_mm(inches):
return mm
#TODO add function inches to metres
# TODO add function inches_to_cm
Supports Markdown
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