Skip to content

Commit d71a563

Browse files
authoredApr 30, 2017
fix sipify_all
1 parent c437b55 commit d71a563

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed
 

‎scripts/sipify_all.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,7 @@ done < <(
4242
${GP}sed -n -r 's/^%Include (.*\.sip)/core\/\1/p' python/core/core.sip
4343
${GP}sed -n -r 's/^%Include (.*\.sip)/gui\/\1/p' python/gui/gui.sip
4444
${GP}sed -n -r 's/^%Include (.*\.sip)/analysis\/\1/p' python/analysis/analysis.sip
45-
<<<<<<< HEAD
46-
${GP}sed -n -r 's/^%Include (.*\.sip)/server\/\1/p' python/analysis/server.sip
47-
=======
4845
${GP}sed -n -r 's/^%Include (.*\.sip)/server\/\1/p' python/server/server.sip
49-
>>>>>>> a86f5ea52d75862c190105d1ceb23c47a61bba4e
5046
)
5147

5248
echo " => $count files sipified!"

0 commit comments

Comments
 (0)
Please sign in to comment.