Fixes conflicts after merge

Samo Penic

2016-12-06 1d1f5861495fc6e07d8a683ca8dbbaa43936b212

 src/tsmeasure.c

@@ -84,7 +84,6 @@
         tape_free(vesicle->tape);
         vesicle_free(vesicle);
               }
      free(ent);  
      }
   for (n = 0; n < count; n++)
     {