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

diff --git a/src/vertexmove.h b/src/vertexmove.h
index 0c24d54..c58ee64 100644
--- a/src/vertexmove.h
+++ b/src/vertexmove.h
@@ -1,3 +1,6 @@
 
 ts_bool single_verticle_timestep(ts_vesicle *vesicle,ts_vertex *vtx,ts_double *rn);
 
+ts_bool single_poly_vertex_move(ts_vesicle *vesicle,ts_poly *poly,ts_vertex *vtx,ts_double *rn);
+
+ts_bool single_filament_vertex_move(ts_vesicle *vesicle,ts_poly *poly,ts_vertex *vtx,ts_double *rn);

--
Gitblit v1.9.3