fix

2020-10-11 20:50:21 +02:00
parent 4668527a2d
commit a42c275a09
1 changed files with 0 additions and 4 deletions
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -780,11 +780,7 @@ 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'