From 5b5b3ba9b9545c52aae094f02d91e00f07938e72 Mon Sep 17 00:00:00 2001
From: Valerio Mariani <valerio.mariani@unibas.ch>
Date: Mon, 21 Feb 2011 19:01:25 +0100
Subject: [PATCH] Fixed a problem with merge of create_bundle.py

---
 deployment/linux/create_bundle.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/deployment/linux/create_bundle.py b/deployment/linux/create_bundle.py
index 5f074eba3..cf0ce5f61 100644
--- a/deployment/linux/create_bundle.py
+++ b/deployment/linux/create_bundle.py
@@ -12,10 +12,6 @@ if len(sys.argv) < 2:
   print 'usage: create_bundle.py  additional_label'
   sys.exit()
 
-<<<<<<< HEAD
-#boost_string='\".so.1.42.0\"'
-=======
->>>>>>> Further updated to create_bundle.py
 system_python_version='python2.6'
 system_python_bin='/usr/bin/'+system_python_version
 system_python_libs='/usr/lib/'+system_python_version
-- 
GitLab