Merge branch 'release/v14.42'

2020-11-14 12:30:51 +01:00
parent 118f59516c 15e881f7c5
commit 530384519b
1 changed files with 0 additions and 4 deletions
--- a/rowers/templates/fastestvirtualeventcreate.html
+++ b/rowers/templates/fastestvirtualeventcreate.html
@@ -55,11 +55,7 @@
          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