Skip to content
Snippets Groups Projects
Commit fc6f8091 authored by Jack Pink's avatar Jack Pink
Browse files

fixed merge conflicts

parents 76dc369c d0f54563
Branches feature_m
No related tags found
1 merge request!4added m feature placeholder
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 0 deletions
rainfall_conversion.py
+ 2
− 0
View file @ fc6f8091
......@@ -3,3 +3,5 @@ def inches_to_mm(inches):
return mm
#TODO add function inches to metres
# TODO add function inches_to_cm
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment