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

diff --git a/src/initial_distribution.h b/src/initial_distribution.h
index 7b3e2ba..20bbf18 100644
--- a/src/initial_distribution.h
+++ b/src/initial_distribution.h
@@ -1,6 +1,8 @@
+#include "io.h"
+
+
 /** @brief initial bond length */
 #define A0 1.2 
-
 
 /** @brief Creates initial distribution of vertices
   *
@@ -10,6 +12,7 @@
 */
 ts_vesicle *initial_distribution_dipyramid(ts_uint nshell, ts_uint ncmax1, ts_uint ncmax2, ts_uint ncmax3, ts_double stepsize);
 
+ts_vesicle *create_vesicle_from_tape(ts_tape *tape);
 
 /** Sets the initial position of the vertexes to dipyramid
  *

--
Gitblit v1.9.3