From 719c9febac2eaff9483fda487b57684afbb59bb2 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Wed, 05 Mar 2014 16:47:50 +0000
Subject: [PATCH] dont know

---
 src/tape |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/tape b/src/tape
index 10db609..914bf81 100644
--- a/src/tape
+++ b/src/tape
@@ -2,7 +2,7 @@
 # nshell is a number of divisions of dipyramid
 nshell=17
 # dmax is the max. bond length 
-dmax=1.4
+dmax=1.7
 # bending rigidity of the membrane 
 xk0=25.0
 # max step size 
@@ -28,7 +28,11 @@
 #how many initial mcsweeps*inititer MC sweeps before recording to disk?
 inititer=1
 #how many records do you want on the disk iteration are there in a run?
+<<<<<<< HEAD
+iterations=10
+=======
 iterations=10000
+>>>>>>> e9eab4fb2f72383a1a2adbe5f09f7bbd1fd45768
 
 
 #shut up if we are using cluster!!!

--
Gitblit v1.9.3