updated changelog

Signed-off-by: Pujal <[email protected]>
zowe · Nov 21, 2024 · 017ae44 · 017ae44
1 parent 1c5aff5
commit 017ae44
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/packages/zosfiles/CHANGELOG.md b/packages/zosfiles/CHANGELOG.md
@@ -2,13 +2,10 @@
 
 All notable changes to the Zowe z/OS files SDK package will be documented in this file.
 
-<<<<<<< HEAD
 ## Recent Changes
 
 - Enhancement: Added a `List.membersMatchingPattern` method to download all members that match a specific pattern.[#2359](https://github.com/zowe/zowe-cli/pull/2359)
 
-=======
->>>>>>> master
 ## `8.8.4`
 
 - Enhancement: Allows extenders of the Search functionality to pass a function `abortSearch` on `searchOptions` to abort a search. [#2370](https://github.com/zowe/zowe-cli/pull/2370)