From d3d10f1abdd01816f3a8cf69318a22584660a64d Mon Sep 17 00:00:00 2001
From: Nicolas Forquet <nicolas.forquet@irstea.fr>
Date: Wed, 18 Dec 2019 17:59:26 +0100
Subject: [PATCH] merge

---
 ohmpy_v_1_01.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/ohmpy_v_1_01.py b/ohmpy_v_1_01.py
index f272794a..0bbb39e0 100644
--- a/ohmpy_v_1_01.py
+++ b/ohmpy_v_1_01.py
@@ -3,23 +3,13 @@
 OHMPY_code is a program to control the low-cost and open source resistivity meter
 OHMPY, it has been developed by Rémi CLEMENT,Vivien DUBOIS, Nicolas FORQUET (IRSTEA) and Yannick FARGIER (IFSTTAR).
 """
-<<<<<<< HEAD
-print 'OHMPI start' 
-print MyDateTime.isoformat()
-print 'Import library'
-=======
 print('OHMPI start' )
 print('Import library')
->>>>>>> develop
 
 #!/usr/bin/python
 import RPi.GPIO as GPIO
 import time
-<<<<<<< HEAD
-import datetime
-=======
 from datetime import datetime
->>>>>>> develop
 import board
 import busio
 import numpy
-- 
GitLab