Unkonown merge difference between different directories are merged together.

Samo Penic

2015-10-06 6c3bb91fea92c5013507bdf4f5ac49e889e213ff

 src/vesicle.c

@@ -7,6 +7,7 @@
#include "stdlib.h"
#include "poly.h"
#include "sh.h"
#include "shcomplex.h"

ts_vesicle *init_vesicle(ts_uint N, ts_uint ncmax1, ts_uint ncmax2, ts_uint
ncmax3, ts_double stepsize){
@@ -36,7 +37,7 @@
    triangle_list_free(vesicle->tlist);
    cell_list_free(vesicle->clist);
    poly_list_free(vesicle->poly_list);
    sph_free(vesicle->sphHarmonics);
    complex_sph_free(vesicle->sphHarmonics);
    free(vesicle);
    return TS_SUCCESS;
}