From 7a958c35132eab0bfa72aa6f048c56beefe20779 Mon Sep 17 00:00:00 2001
From: Erik Ziegler <erik.ziegler@ulg.ac.be>
Date: Fri, 30 Oct 2015 12:27:30 +0100
Subject: [PATCH] Fixed rebasing error

---
 .../components/lesionTable/lesionTable.js         | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/Packages/lesiontracker/components/lesionTable/lesionTable.js b/Packages/lesiontracker/components/lesionTable/lesionTable.js
index 5a1d72bce..15160d1b8 100644
--- a/Packages/lesiontracker/components/lesionTable/lesionTable.js
+++ b/Packages/lesiontracker/components/lesionTable/lesionTable.js
@@ -3,22 +3,12 @@ TabsTimepoints = new Meteor.Collection(null);
 
 Template.lesionTable.helpers({
     'measurement': function() {
-<<<<<<< HEAD
-        var contentId = Session.get("activeContentId");
+        var contentId = this.contentId;
         return Measurements.find({contentId: contentId});
     },
     'tabTimepoints': function() {
-        var contentId = Session.get("activeContentId");
+        var contentId = this.contentId;
         return TabsTimepoints.find({contentId: contentId});
-=======
-        var contentId = this.contentId;
-        console.log(Measurements.find({contentId: contentId}));
-        return Measurements.find({contentId: contentId});
-    },
-    'timepointNames': function() {
-        var contentId = this.contentId;
-        return Template.instance().timepointNamesDictionary.get(contentId);
->>>>>>> Updates to improve reactivity, session storage, logging
     },
     'lesionData': function() {
         var array = [];
@@ -37,6 +27,7 @@ Template.lesionTable.onRendered(function() {
 
     var totalViewports = viewportColumns * viewportRows;
     
+    var timepointsArray = [];
     for(var i=0; i< totalViewports;  i++) {
         var timepointID = contentId.toString() + i.toString();
         var timepointName = "Baseline";