sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

merge

Browse Source
This commit is contained in:
Sander Roosendaal
2019-01-21 17:24:23 +01:00
parent 01b1cd1378
commit a3a72121de
4 changed files with 1 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
rowers/tests/testdata/testdata.csv.gz vendored
View File

Binary file not shown.

6
rowers/tests/testdata/testdata.tcx vendored
View File

@@ -2502,11 +2502,7 @@
</Trackpoint>
</Track>
</Lap>
<<<<<<< HEAD
<Notes>&lt;Element 'Notes' at 0x1477a860&gt;</Notes>
=======
<Notes>&lt;Element 'Notes' at 0x13a97908&gt;</Notes>
>>>>>>> develop
<Notes>&lt;Element 'Notes' at 0x13699b70&gt;</Notes>
</Activity>
</Activities>
<Creator>