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

Merge branch 'develop' into feature/opaqueid

Browse Source
This commit is contained in:
Sander Roosendaal
2019-01-31 08:54:40 +01:00
parent c4e350f970 735d4433a7
commit 7a942dc473
13 changed files with 542 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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