Merge branch 'develop' into feature/fitnesschart

rowers/dataprep.py

@@ -1495,7 +1495,6 @@ def checkduplicates(r,workoutdate,workoutstartdatetime,workoutenddatetime):
 
 
     if (len(ws2) != 0):
-        print('len ws2 ',len(ws2))
         message = "Warning: This workout overlaps with an existing one and was marked as a duplicate"
         duplicate = True
         return duplicate

rowers/uploads.py

@@ -524,6 +524,9 @@ def make_private(w,options):
         return 1
 
 def do_sync(w,options, quick=False):
+    if w.duplicate:
+        return 0
+
     try:
         upload_to_strava = options['upload_to_Strava']
     except KeyError: