Merge branch 'release/dataprep6'

2016-11-27 22:17:29 +01:00
parent 0c10cf7c3c 58cf83f7cf
commit a39b5932d6
1 changed files with 3 additions and 2 deletions
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -74,8 +74,9 @@ def timedeltaconv(x):
    if not np.isnan(x):
        dt = datetime.timedelta(seconds=x)
    else:
-        dt = 350.
-
+        dt = datetime.timedelta(seconds=350.)
+        
+        
    return dt

 def rdata(file,rower=rrower()):