Merge branch 'develop' into feature/fastestchallenges

2020-11-10 19:31:56 +01:00
parent 7b79600638 c230dd6e1b
commit 06bbce45b8
2 changed files with 16 additions and 2 deletions
--- a/rowers/templates/fastestvirtualeventcreate.html
+++ b/rowers/templates/fastestvirtualeventcreate.html
@@ -55,7 +55,11 @@
          The participants can row this challenge on any course, and their fastest time
          over the challenge distance (respectively the largest distance achieved over the
          challenge duration) is automatically extracted from the workout. No
+<<<<<<< HEAD
          need to program a set piece. 
+=======
+          need to program a set piece.
+>>>>>>> develop
        </p>
        <p>
          Standard Times are a way to compare results in a race category with