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

diff --git a/src/general.h b/src/general.h
index 74293de..983361b 100644
--- a/src/general.h
+++ b/src/general.h
@@ -258,6 +258,7 @@
 	long int nczmax;
 	long int npoly;
 	long int nmono;
+	long int internal_poly;
 	long int nfil;
 	long int nfono;
 	long int R_nucleus;
@@ -284,6 +285,10 @@
 	long int mcsweeps;
 	long int quiet;
 	long int shc;
+	long int number_of_vertices_with_c0;
+	ts_double c0;
+	ts_double w;
+	ts_double F;
 } ts_tape;
 
 

--
Gitblit v1.9.3