d

2026-03-13 11:30:40 +01:00
parent c1e5cf649a
commit 67d6548566
1 changed files with 0 additions and 3 deletions
--- a/rowers/tasks.py
+++ b/rowers/tasks.py
@@ -357,8 +357,6 @@ def correct_intensity(workout):

    return workout

-<<<<<<< HEAD
-=======
 import io
 import zipfile

@@ -428,7 +426,6 @@ def email_all_user_workouts_zip(rower, start_date=None, end_date=None, debug=Fal

    return 1
    
->>>>>>> release/v23.9.0

@app.task
 def handle_loadnextweek(rower, debug=False, **kwargs):