From 2eb6ec249a8e6e8e36f369e6e100bcf365c3c6db Mon Sep 17 00:00:00 2001 From: Phil-NHS Date: Tue, 8 Apr 2025 11:28:53 +0100 Subject: [PATCH 1/2] fix(diff): merge --- Package.BlazorComponentLibrary/Components/SimpleCounter.razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Package.BlazorComponentLibrary/Components/SimpleCounter.razor b/Package.BlazorComponentLibrary/Components/SimpleCounter.razor index 29e29ad..df92a79 100644 --- a/Package.BlazorComponentLibrary/Components/SimpleCounter.razor +++ b/Package.BlazorComponentLibrary/Components/SimpleCounter.razor @@ -1,7 +1,7 @@ 

Simple Counter

Feat123 @code { From dff28f2ea04c9fd660f38c7f44a1d1ba8eb5cf41 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 8 Apr 2025 10:30:27 +0000 Subject: [PATCH 2/2] chore(release): 5.5.8-feat-try-different-merge-inot-master.1 [skip ci] ## [5.5.8-feat-try-different-merge-inot-master.1](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/compare/v5.5.7...v5.5.8-feat-try-different-merge-inot-master.1) (2025-04-08) ### Bug Fixes * **diff:** merge ([2eb6ec2](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/commit/2eb6ec249a8e6e8e36f369e6e100bcf365c3c6db)) --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f0e34b5..0c827f3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +## [5.5.8-feat-try-different-merge-inot-master.1](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/compare/v5.5.7...v5.5.8-feat-try-different-merge-inot-master.1) (2025-04-08) + + +### Bug Fixes + +* **diff:** merge ([2eb6ec2](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/commit/2eb6ec249a8e6e8e36f369e6e100bcf365c3c6db)) + ## [5.5.8-feat-try-branch-versioning.1](https://github.com/TechnologyEnhancedLearning/GitPageBlazorWASM/compare/v5.5.7...v5.5.8-feat-try-branch-versioning.1) (2025-04-08)