Skip to content

Fix JSON formatting in data.nl-NL.json#12438

Merged
tdipisa merged 1 commit into
geosolutions-it:backport-12300-to-2026.01.xxfrom
ygodaert:patch-1
May 28, 2026
Merged

Fix JSON formatting in data.nl-NL.json#12438
tdipisa merged 1 commit into
geosolutions-it:backport-12300-to-2026.01.xxfrom
ygodaert:patch-1

Conversation

@ygodaert
Copy link
Copy Markdown
Contributor

Description

Please check if the PR fulfills these requirements

What kind of change does this PR introduce? (check one with "x", remove the others)

  • Bugfix
  • Feature
  • Code style update (formatting, local variables)
  • Refactoring (no functional changes, no api changes)
  • Build related changes
  • CI related changes
  • Other... Please describe:

Issue

#12436

What is the new behavior?
Removed
"<<<<<<< HEAD
======="

Breaking change

Does this PR introduce a breaking change? (check one with "x", remove the other)

  • Yes, and I documented them in migration notes
  • No

Other useful information

@tdipisa tdipisa merged commit 1b79881 into geosolutions-it:backport-12300-to-2026.01.xx May 28, 2026
3 checks passed
tdipisa added a commit that referenced this pull request May 29, 2026
* BACKPORT-CONFLICT

* Fix JSON formatting in data.nl-NL.json (#12438)

* Update data.nl-NL.json

---------

Co-authored-by: ygodaert <82503232+ygodaert@users.noreply.github.com>
Co-authored-by: Tobia Di Pisa <tobia.dipisa@geosolutionsgroup.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants