Fix bad merge

- restore accidental deletion from changelog conflict
- remove steps no longer needed in Electron build

Contributed on behalf of STMicroelectronics.

Signed-off-by: Christian W. Damus <cdamus.ext@eclipsesource.com>

.github/workflows/performance-tests.yml

@@ -29,8 +29,6 @@ jobs:
         shell: bash
         run: |
           yarn --skip-integrity-check --network-timeout 100000 --ignore-engines
-          npx electron-replace-ffmpeg
-          npx electron-codecs-test
           yarn build:examples
         env:
           NODE_OPTIONS: --max_old_space_size=4096

CHANGELOG.md

@@ -39,6 +39,7 @@
 - [repo] upgraded `minimatch` from `v3.0.4` to `v5.1.0` [#11820](https://github.com/eclipse-theia/theia/pull/11820)
 - [repo] upgraded the `lerna` from `v5.5.4` to `v6.0.1` [#11820](https://github.com/eclipse-theia/theia/pull/11820)
 - [repo] upgraded the `mocha` dependency and configurations from `^7.0.0` to `^10.1.0` [#11820](https://github.com/eclipse-theia/theia/pull/11820)
+- [tasks] added support for `reevaluateOnRerun` run option [#11759](https://github.com/eclipse-theia/theia/pull/11759) - Contributed on behalf of STMicroelectronics
 
 <a name="breaking_changes_1.32.0">[Breaking Changes:](#breaking_changes_1.32.0)</a>