From 1d1f5861495fc6e07d8a683ca8dbbaa43936b212 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Dec 2016 13:43:15 +0000
Subject: [PATCH] Fixes conflicts after merge

---
 src/vesicle.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/vesicle.h b/src/vesicle.h
index e8f09fb..953e0a2 100644
--- a/src/vesicle.h
+++ b/src/vesicle.h
@@ -7,4 +7,5 @@
 ts_bool vesicle_free(ts_vesicle *vesicle);
 ts_bool vesicle_volume(ts_vesicle *vesicle);
 ts_bool vesicle_area(ts_vesicle *vesicle);
+ts_double vesicle_meancurvature(ts_vesicle *vesicle);
 #endif

--
Gitblit v1.9.3