From 46b8d53cc43e86b3ff8b3ed1db39edd73982f8c6 Mon Sep 17 00:00:00 2001
From: "rtrp@factory1" <rtrp@factory1.com>
Date: Wed, 13 Jan 2021 11:58:27 +0000
Subject: [PATCH] remove merge conflict artefacts.

---
 cli_meter.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cli_meter.py b/cli_meter.py
index 03a2bb3..f1ee85f 100755
--- 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)