Skip to content
Snippets Groups Projects
Commit f892f86e authored by Valerio Mariani's avatar Valerio Mariani Committed by Ansgar Philippsen
Browse files

Fixed a problem with merge of create_bundle.py

parent b815ee4e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
deployment/linux/create_bundle.py
+ 0
− 4
View file @ f892f86e
...@@ -12,10 +12,6 @@ if len(sys.argv) < 2: ...@@ -12,10 +12,6 @@ if len(sys.argv) < 2:
print 'usage: create_bundle.py additional_label' print 'usage: create_bundle.py additional_label'
sys.exit() sys.exit()
<<<<<<< HEAD
#boost_string='\".so.1.42.0\"'
=======
>>>>>>> Further updated to create_bundle.py
system_python_version='python2.6' system_python_version='python2.6'
system_python_bin='/usr/bin/'+system_python_version system_python_bin='/usr/bin/'+system_python_version
system_python_libs='/usr/lib/'+system_python_version system_python_libs='/usr/lib/'+system_python_version
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment