From 42b64837353dd6a8a7fe4c80f0b58eff5d58fb5b Mon Sep 17 00:00:00 2001 From: Evan Read Date: Thu, 23 Jul 2020 08:09:43 +1000 Subject: Remove merge conflict line from script --- scripts/normalize-links.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'scripts') diff --git a/scripts/normalize-links.sh b/scripts/normalize-links.sh index 25a396d5..502b6d2d 100755 --- a/scripts/normalize-links.sh +++ b/scripts/normalize-links.sh @@ -66,7 +66,6 @@ find ${TARGET}/$VER -type f -name '*.html' -print0 | xargs -0 sed -i 's#="/opens echo "Replace full URLs in $TARGET/$VER for /ce/" find ${TARGET}/$VER -type f -name '*.html' -print0 | xargs -0 sed -i 's#="https://docs.gitlab.com/ce/#="/'"$VER"'/ce/#g' -<<<<<<< HEAD echo "Replace full URLs in $TARGET/$VER for /ee/" find ${TARGET}/$VER -type f -name '*.html' -print0 | xargs -0 sed -i 's#="https://docs.gitlab.com/ee/#="/'"$VER"'/ee/#g' -- cgit v1.2.3