Compare commits

...

6 Commits

Author SHA1 Message Date
0b503c6348 Merge pull request 'add updates to number_utils for testing' (#1) from testing into main
Reviewed-on: #1
2026-04-05 15:57:49 +00:00
2b81f23477 add updates to number_utils for testing 2026-04-05 11:56:40 -04:00
1ad3d78090 fixed merge issues 2026-04-05 11:54:23 -04:00
4d715a020a other change to temperature 2026-04-05 11:46:31 -04:00
cb6369bcb8 rounding temperature 2026-04-05 11:45:18 -04:00
c563eabec2 adding number utils 2026-04-05 11:42:12 -04:00
3 changed files with 21 additions and 1 deletions

8
number_utils.py Normal file
View File

@@ -0,0 +1,8 @@
#!/usr/bin/python3
# more code for hw
def is_even(n):
return n % 2 == 0
def is_odd(n):
return n % 2 != 0

View File

@@ -2,4 +2,6 @@
# dummy code for hw
def to_celsius(fahrenheit):
return (fahrenheit - 32) * 5 / 9
celsius = (fahrenheit - 32) * 5 / 9
celsius = round(celsius)
return celsius

10
temperature.py.orig Normal file
View File

@@ -0,0 +1,10 @@
#!/usr/bin/python3
# dummy code for hw
def to_celsius(fahrenheit):
<<<<<<< HEAD
celsius = (fahrenheit - 32) * 5 / 9
return celsius
=======
return round((fahrenheit - 32) * 5 / 9)
>>>>>>> feature-temperature-format