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

passing tests

Browse Source
This commit is contained in:
Sander Roosendaal
2019-01-31 09:47:01 +01:00
parent 7a942dc473
commit 4c1f898143
2 changed files with 1 additions and 5 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> </Trackpoint>
</Track> </Track>
</Lap> </Lap>
<<<<<<< HEAD <Notes>&lt;Element 'Notes' at 0x13a90b38&gt;</Notes>
<Notes>&lt;Element 'Notes' at 0x157a2e48&gt;</Notes>
=======
<Notes>&lt;Element 'Notes' at 0x1d49a6d8&gt;</Notes>
>>>>>>> develop
</Activity> </Activity>
</Activities> </Activities>
<Creator> <Creator>