remove merge conflict artefacts.

3 years ago · 46b8d53cc4
1 changed files with 0 additions and 2 deletions
--- a/cli_meter.py
+++ b/cli_meter.py
@ -50,8 +50,6 @@ def get_api_url():

 api_url = get_api_url()

->>>>>>> origin/fact2temp
-
 def discharge():
    GPIO.setup(a_pin, GPIO.IN)
    GPIO.setup(b_pin, GPIO.OUT)