Resolve conflicts

Signed-off-by: Himani1519 <[email protected]>
zowe · Sep 5, 2023 · 926f654 · 926f654
1 parent e5d03e6
commit 926f654
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,7 +3,6 @@
 All notable changes to the Zlux App Manager will be documented in this file.
 
 ## `2.10.0`
-- This action making a CHANGELOG note via special syntax from the GitHub PR commit message, like it could automatically update CHANGELOG.md with the message. First job checks if PR body has changelog note or not if it's not there then it asked them to add it and second job is to check if changelog note has been added in changelog.md file or not. (#542)
 - Bugfix: Fixed a timing issue with the iframe-adapter for Firefox (#532)
 
 ## `2.8.0`