fixed merge conflicts

fc6f8091 · Jack Pink · 76dc369c · d0f54563 · fc6f8091
Commit fc6f8091 authored May 10, 2022 by Jack Pink
--- a/rainfall_conversion.py
+++ b/rainfall_conversion.py
@@ -3,3 +3,5 @@ def inches_to_mm(inches):
 	 return mm 

 #TODO add function inches to metres
+
+# TODO  add function inches_to_cm