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/shcomplex.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/shcomplex.h b/src/shcomplex.h
index 8968b31..fdd0eb0 100644
--- a/src/shcomplex.h
+++ b/src/shcomplex.h
@@ -5,5 +5,5 @@
 ts_spharm *complex_sph_init(ts_vertex_list *vlist, ts_uint l);
 ts_bool complex_sph_free(ts_spharm *sph);
 ts_bool calculateUlmComplex(ts_vesicle *vesicle);
-ts_bool calculateKc(ts_vesicle *vesicle);
+ts_double calculateKc(ts_vesicle *vesicle, ts_int lmin, ts_int lmax);
 #endif

--
Gitblit v1.9.3