hopefully fixing team tests
This commit is contained in:
BIN
rowers/tests/testdata/testdata.csv.gz
vendored
BIN
rowers/tests/testdata/testdata.csv.gz
vendored
Binary file not shown.
6
rowers/tests/testdata/testdata.tcx
vendored
6
rowers/tests/testdata/testdata.tcx
vendored
@@ -2502,11 +2502,7 @@
|
||||
</Trackpoint>
|
||||
</Track>
|
||||
</Lap>
|
||||
<<<<<<< HEAD
|
||||
<Notes><Element 'Notes' at 0x13699b70></Notes>
|
||||
=======
|
||||
<Notes><Element 'Notes' at 0x1913e400></Notes>
|
||||
>>>>>>> develop
|
||||
<Notes><Element 'Notes' at 0x141312e8></Notes>
|
||||
</Activity>
|
||||
</Activities>
|
||||
<Creator>
|
||||
|
||||
Reference in New Issue
Block a user