bugfix in debian build script

2cb2c35f · eric pellegrini · Remi Perenon · 1960bc83 · 2cb2c35f
Commit 2cb2c35f authored Feb 16, 2018 by eric pellegrini Committed by Remi Perenon Mar 19, 2018
--- a/BuildServer/Debian/run_build.sh
+++ b/BuildServer/Debian/run_build.sh
@@ -12,7 +12,6 @@ BLEU="\\033[1;34m"

 # build ILL version of ScientificPython
 cd /tmp
-<<<<<<< f7dd0f1618cc26371704210243b8235afc4cef45
 rm -rf scientific-python
 git clone https://code.ill.fr/scientific-software/scientific-python.git
 cd scientific-python