removed git junk

turbosnute · May 18, 2020 · 3e0b050 · 3e0b050
1 parent 93d0704
commit 3e0b050
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/netatmo2influxdb.py b/netatmo2influxdb.py
@@ -19,10 +19,9 @@
 netatmo_clientSecret=os.getenv('NETATMO_CLIENT_SECRET', "")
 netatmo_username=os.getenv('NETATMO_USERNAME')
 netatmo_password=os.getenv('NETATMO_PASSWORD')
-<<<<<<< HEAD
+
 # influx env variables
-=======
->>>>>>> 24fd573ec1ace73c95e7efde1d80e7624b6224d6
+
 influxdb_host=os.getenv('INFLUXDB_HOST', "localhost")
 influxdb_port=int(os.getenv('INFLUXDB_PORT', "8086"))
 influxdb_username=os.getenv('INFLUXDB_USERNAME', "root")