Compare commits
6 Commits
f57addc619
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 0b503c6348 | |||
| 2b81f23477 | |||
| 1ad3d78090 | |||
| 4d715a020a | |||
| cb6369bcb8 | |||
| c563eabec2 |
8
number_utils.py
Normal file
8
number_utils.py
Normal 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
|
||||
@@ -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
10
temperature.py.orig
Normal 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
|
||||
Reference in New Issue
Block a user