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/timestep.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/timestep.c b/src/timestep.c
index be14619..f7cb5dd 100644
--- a/src/timestep.c
+++ b/src/timestep.c
@@ -93,7 +93,7 @@
cell_occupation(vesicle);
dump_state(vesicle,i);
if(i>=inititer){
- write_vertex_xml_file(vesicle,i-inititer);
+ write_vertex_xml_file(vesicle,i-inititer,NULL);
write_master_xml_file(command_line_args.output_fullfilename);
epochtime=get_epoch();
gyration_eigen(vesicle, &l1, &l2, &l3);
--
Gitblit v1.9.3