fix sipify_all

3nids · web-flow · commit d71a563ee147 · 2017-04-30T12:58:34.000+02:00
diff --git a/scripts/sipify_all.sh b/scripts/sipify_all.sh
@@ -42,11 +42,7 @@ done < <(
 ${GP}sed -n -r 's/^%Include (.*\.sip)/core\/\1/p' python/core/core.sip
 ${GP}sed -n -r 's/^%Include (.*\.sip)/gui\/\1/p' python/gui/gui.sip
 ${GP}sed -n -r 's/^%Include (.*\.sip)/analysis\/\1/p' python/analysis/analysis.sip
-<<<<<<< HEAD
-${GP}sed -n -r 's/^%Include (.*\.sip)/server\/\1/p' python/analysis/server.sip
-=======
 ${GP}sed -n -r 's/^%Include (.*\.sip)/server\/\1/p' python/server/server.sip
->>>>>>> a86f5ea52d75862c190105d1ceb23c47a61bba4e
   )
 
 echo " => $count files sipified!"
