Merge branch 'develop' into feature/cp2

2020-10-11 20:34:15 +02:00
parent e0f11a3c1f ea5c99ad57
commit 4668527a2d
2 changed files with 8 additions and 3 deletions
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -780,7 +780,11 @@ def analysis_view_data(request,userid=0):
    elif function == 'compare':
        script,div = comparisondata(workouts,options)
    elif function == 'cp':
+<<<<<<< HEAD
        script, div = cpdata(workouts, options)
+=======
+        script, div = cpdata(workouts,options)
+>>>>>>> develop
    else:
        script = ''
        div = 'Unknown analysis functions'