Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
@hugary1995
hugary1995 committed Jan 5, 2025
2 parents e3ebf65 + 09cac5c commit bd92b7e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion moose
Submodule moose updated 14 files
+ − framework/doc/content/media/meshgenerators/combiner_multi_translate.png
+1 −1 framework/doc/content/source/meshgenerators/CombinerGenerator.md
+7 −0 framework/src/meshgenerators/CombinerGenerator.C
+1 −1 large_media
+12 −0 modules/doc/content/help/development/VSCode.md
+0 −11 python/MooseDocs/commands/check.py
+0 −4 python/MooseDocs/extensions/appsyntax.py
+4 −14 python/MooseDocs/extensions/content.py
+1 −1 python/MooseDocs/main.py
+1 −1 python/MooseDocs/tree/tokens.py
+1 −1 python/TestHarness/tests/tests
+ − test/tests/meshgenerators/combiner_generator/gold/combiner_multi_input_translate_from_file_in.e
+ − test/tests/meshgenerators/combiner_generator/gold/combiner_multi_input_translate_in.e
+5 −5 test/tests/misc/intermittent_failure/intermittent_failure.i

0 comments on commit bd92b7e

Please sign in to comment.