Unkonown merge difference between different directories are merged together.

Samo Penic

2015-10-06 6c3bb91fea92c5013507bdf4f5ac49e889e213ff

 src/initial_distribution.c

@@ -42,6 +42,7 @@
   ts_vertex *vtx;

   vesicle=initial_distribution_dipyramid(tape->nshell,tape->ncxmax,tape->ncymax,tape->nczmax,tape->stepsize);
    vesicle->tape=tape;
   // Nucleus:
   vesicle->R_nucleus=tape->R_nucleus*tape->R_nucleus;