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

Merge branch 'develop' into feature/testcoverage3

Browse Source
This commit is contained in:
Sander Roosendaal
2019-01-23 14:05:43 +01:00
parent 6d4823d73c 2e2159778b
commit 5b9b756fef
2 changed files with 11 additions and 3 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 0x13db9b70&gt;</Notes>
=======
<Notes>&lt;Element 'Notes' at 0x11aaf780&gt;</Notes>
>>>>>>> develop
</Activity>
</Activities>
<Creator>