Fix merge confilicts

lbetz · lbetz · commit 3ec3f30709a3 · 2025-02-03T15:29:40.000+01:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,9 +4,9 @@ All notable changes to this project will be documented in this file.
 Each new release typically also includes the latest modulesync defaults.
 These should not affect the functionality of the module.
 
-## [Unreleased](https://github.com/voxpupuli/puppet-icingaweb2/tree/HEAD)
+## [v5.1.0](https://github.com/voxpupuli/puppet-icingaweb2/tree/v5.1.0) (2025-02-03)
 
-[Full Changelog](https://github.com/voxpupuli/puppet-icingaweb2/compare/v5.0.1...HEAD)
+[Full Changelog](https://github.com/voxpupuli/puppet-icingaweb2/compare/v5.0.1...v5.1.0)
 
 **Implemented enhancements:**
 
diff --git a/metadata.json b/metadata.json
@@ -1,6 +1,6 @@
 {
   "name": "puppet-icingaweb2",
-  "version": "5.0.2-rc0",
+  "version": "5.1.0",
   "author": "Vox Pupuli",
   "summary": "Icinga Web 2 Puppet Module",
   "license": "Apache-2.0",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "puppet-icingaweb2",`
`3`		`- "version": "5.0.2-rc0",`
	`3`	`+ "version": "5.1.0",`
`4`	`4`	`"author": "Vox Pupuli",`
`5`	`5`	`"summary": "Icinga Web 2 Puppet Module",`
`6`	`6`	`"license": "Apache-2.0",`