[chronojump] Merging one file

[Xavier de Blas <xaviblas src gnome org>]

commit ba6877585f0c0c85bf0bc33e0af68907d481fe2a
Author: Xavier de Blas <xaviblas gmail com>
Date:   Tue Feb 2 11:31:11 2021 +0100

    Merging one file

 versions/2.1.0.html | 3 +++
 1 file changed, 3 insertions(+)
---
diff --git a/versions/2.1.0.html b/versions/2.1.0.html
index 3ed874a4..f85b82fc 100644
--- a/versions/2.1.0.html
+++ b/versions/2.1.0.html
@@ -1,8 +1,11 @@
+<<<<<<< Updated upstream
 <b>2.1.0-14</b> is a quick fix:
 <ul>
        <li>Fixed a bug on race analyzer capture since last version.</li>
        <li>Added graph and text explaining equivalent mass on inertial encoder.</li>
 </ul>
+=======
+>>>>>>> Stashed changes
 
 
 <p><span class="highlight2"><i class="fa fa-area-chart fa-2x"></i>  General Chronojump changes</span></p>