From ff434a864970683dbbbb795b1c0ab3f76ddbbd0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Barou=C5=A1?= Date: Sat, 7 Nov 2020 19:29:01 +0100 Subject: [PATCH] Fixes spaces at EOL in changelog.yml (#10471) --- .travis.yml | 2 +- html/changelogs/example.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 834475ca40e..72e12a30f6f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -92,7 +92,7 @@ jobs: - (num=`grep -EIr '\\\\(he|him|his|she|hers|He|His|She|himself|herself)\b' code | wc -l`; echo "$num gender-based escapes (expecting ${GENDER_COUNT} or less)"; [ $num -eq ${GENDER_COUNT} ]) - (num=`grep -r --include \*.dm -oh to_world\( . | wc -w`; echo "$num to_worlds (expecting ${TO_WORLD_COUNT})"; [ $num -eq ${TO_WORLD_COUNT} ]) - awk -f tools/indentation.awk **/*.dm - - md5sum -c - <<< "60a49502d9f6dfdcc255deb98c901b72 *html/changelogs/example.yml" + - md5sum -c - <<< "6a5ae087fe5bfa66e52e508655e57120 *html/changelogs/example.yml" - python3 tools/TagMatcher/tag-matcher.py ../.. - python3 tools/GenerateChangelog/ss13_genchangelog.py html/changelog.html html/changelogs --dry-run - python3 tools/mapmerge2/travis_mapcheck.py diff --git a/html/changelogs/example.yml b/html/changelogs/example.yml index bb5278af870..b3574a3ffce 100644 --- a/html/changelogs/example.yml +++ b/html/changelogs/example.yml @@ -6,7 +6,7 @@ # Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) # When it is, any changes listed below will disappear. # -# Valid Prefixes: +# Valid Prefixes: # bugfix # wip (For works in progress) # tweak @@ -26,7 +26,7 @@ # refactor ################################# -# Your name. +# Your name. author: ChangeMe # Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. @@ -37,6 +37,6 @@ delete-after: True # SCREW THIS UP AND IT WON'T WORK. # Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. # Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. -changes: +changes: - rscadd: "Added a changelog editing system that should cause fewer conflicts and more accurate timestamps." - rscdel: "Killed innocent kittens."