sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

fix

Browse Source
This commit is contained in:
Sander Roosendaal
2020-10-11 20:50:21 +02:00
parent 4668527a2d
commit a42c275a09
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
rowers/views/analysisviews.py
View File

@@ -780,11 +780,7 @@ def analysis_view_data(request,userid=0):
elif function == 'compare': elif function == 'compare':
script,div = comparisondata(workouts,options) script,div = comparisondata(workouts,options)
elif function == 'cp': elif function == 'cp':
<<<<<<< HEAD
script, div = cpdata(workouts, options) script, div = cpdata(workouts, options)
=======
script, div = cpdata(workouts,options)
>>>>>>> develop
else: else:
script = '' script = ''
div = 'Unknown analysis functions' div = 'Unknown analysis functions'