From a42c275a096db395286428559b96fbefc049bb2d Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Sun, 11 Oct 2020 20:50:21 +0200 Subject: [PATCH] fix --- rowers/views/analysisviews.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py index 8d75146e..43b2563b 100644 --- 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'