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

diff --git a/src/energy.h b/src/energy.h
index 4d51b24..1b97fa9 100644
--- a/src/energy.h
+++ b/src/energy.h
@@ -7,5 +7,5 @@
 
 ts_bool sweep_attraction_bond_energy(ts_vesicle *vesicle);
 inline ts_bool attraction_bond_energy(ts_bond *bond, ts_double w);
-
+ts_double direct_force_energy(ts_vesicle *vesicle, ts_vertex *vtx, ts_vertex *vtx_old);
 #endif

--
Gitblit v1.9.3