mirror of
https://github.com/google/blockly.git
synced 2026-01-14 12:27:10 +01:00
Files that have had manual merge conflict resolution performed: - gulpfile.js Files where a merge conflic was resolved by deleting the file, because it had previously been deleted in no-checkin-built: - *_compresed.js* - msg/js/*.js - tests/run_all_tests.sh Changes made (in no-checkin-built) to the following files that have been deleted or obsoleted will need to be dealt with manually; this will be done in a separate commit for clarity: - tests/run_all_tests.sh - tests/scripts/check_metadata.sh - tests/scripts/run_generators.sh