From 4c1f8981435a82c3867a3001e96a4dc8be723811 Mon Sep 17 00:00:00 2001
From: Sander Roosendaal <roosendaalsander@gmail.com>
Date: Thu, 31 Jan 2019 09:47:01 +0100
Subject: [PATCH] passing tests

---
 rowers/tests/testdata/testdata.csv.gz | Bin 11426 -> 11426 bytes
 rowers/tests/testdata/testdata.tcx    |   6 +-----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/rowers/tests/testdata/testdata.csv.gz b/rowers/tests/testdata/testdata.csv.gz
index af7c485589b729264e599a966bf8b56fcd8ca356..26b84f399637067a3c21d921fd76e782ea0c7551 100644
GIT binary patch
delta 16
XcmZ1!xhRrdzMF%?ZgtQ`_SrfBFYpC&

delta 16
XcmZ1!xhRrdzMF&N!~w63?6Y+MGz<m_

diff --git a/rowers/tests/testdata/testdata.tcx b/rowers/tests/testdata/testdata.tcx
index 144ed946..e0e14ee9 100644
--- a/rowers/tests/testdata/testdata.tcx
+++ b/rowers/tests/testdata/testdata.tcx
@@ -2502,11 +2502,7 @@
           </Trackpoint>
         </Track>
       </Lap>
-<<<<<<< HEAD
-      <Notes>&lt;Element 'Notes' at 0x157a2e48&gt;</Notes>
-=======
-      <Notes>&lt;Element 'Notes' at 0x1d49a6d8&gt;</Notes>
->>>>>>> develop
+      <Notes>&lt;Element 'Notes' at 0x13a90b38&gt;</Notes>
     </Activity>
   </Activities>
   <Creator>