From 6705af6d3d02e47a797c53146666a1d168e1aefc Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 06 Mar 2014 08:56:37 +0000
Subject: [PATCH] Merge branch 'trisurf-polyel'. It is the most debugged version. True, without polymeres dump may not work yet, still, from scratch with polymeres set to 0, there should be minimal time penalty.

---
 src/bondflip.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/bondflip.h b/src/bondflip.h
index 6713c31..8d7ee37 100644
--- a/src/bondflip.h
+++ b/src/bondflip.h
@@ -1,4 +1,4 @@
-#ifdef _H_BONDFLIP
+#ifndef _H_BONDFLIP
 #define _H_BONDFLIP
 
 ts_bool single_bondflip_timestep(ts_vesicle *vesicle, ts_bond *bond, ts_double *rn);

--
Gitblit v1.9.3