From 6c3bb91fea92c5013507bdf4f5ac49e889e213ff Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Oct 2015 12:07:39 +0000
Subject: [PATCH] Unkonown merge difference between different directories are merged together.
---
src/main.c | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/main.c b/src/main.c
index f300719..00bd95f 100644
--- a/src/main.c
+++ b/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);
--
Gitblit v1.9.3