diff options
| author | Evan Read <eread@gitlab.com> | 2020-07-23 01:09:43 +0300 |
|---|---|---|
| committer | Evan Read <eread@gitlab.com> | 2020-07-23 01:09:43 +0300 |
| commit | 42b64837353dd6a8a7fe4c80f0b58eff5d58fb5b (patch) | |
| tree | a9c499dfee97a2f48e9ec94ba648dd3f25e0f5ea /scripts | |
| parent | e2f7feafe6ba616a1ca5faf2d26e7320bb5cc0fe (diff) | |
Remove merge conflict line from script
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/normalize-links.sh | 1 |
1 files changed, 0 insertions, 1 deletions
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' |