Unkonown merge difference between different directories are merged together.

Samo Penic

2015-10-06 6c3bb91fea92c5013507bdf4f5ac49e889e213ff

 src/main.c

@@ -55,6 +55,9 @@
        free(vesicle->tape);
        vesicle->tape=tape;
      vesicle->clist->dmin_interspecies = tape->dmin_interspecies*tape->dmin_interspecies;



        /* spherical harmonics */
        if(tape->shc>0){
           vesicle->sphHarmonics=complex_sph_init(vesicle->vlist,tape->shc);