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/tape |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/src/tape b/src/tape
index 4cd382b..bad3739 100644
--- a/src/tape
+++ b/src/tape
@@ -1,10 +1,6 @@
 ####### Vesicle definitions ###########
 # nshell is a number of divisions of dipyramid
-<<<<<<< HEAD
 nshell=17
-=======
-nshell=10
->>>>>>> nirgov
 # dmax is the max. bond length (in units l_min)
 dmax=1.7
 # dmin_interspecies in the min. dist. between different vertex species (in units l_min)

--
Gitblit v1.9.3