Skip to content

Conversation

@github-actions
Copy link
Contributor

Merge changes from maintenance/mps20232 to maintenance/mps20241.

mhuster23 and others added 4 commits October 27, 2025 10:02
…concatenation

add split intention for StringLiteral
# Conflicts:
#	CHANGELOG.md
#	build/scripts/build-allScripts.xml
#	code/languages/org.iets3.opensource/languages/org.iets3.core.expr.data/org.iets3.core.expr.data.mpl
#	code/languages/org.iets3.opensource/languages/org.iets3.core.expr.util/org.iets3.core.expr.util.mpl
#	code/languages/org.iets3.opensource/tests/test.ts.expr.os/test.ts.expr.os.msd
Copy link
Member

@arimer arimer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed merge conflicts manually. Cascading merge

@arimer arimer merged commit 9f29ccf into maintenance/mps20241 Oct 27, 2025
2 checks passed
@arimer arimer deleted the merge/mps20232 branch October 27, 2025 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants