Update CHANGELOG.md

exoscale · Nov 20, 2023 · afff783 · afff783
1 parent f33879d
commit afff783
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,18 +6,14 @@
 
 - README: document installation from AUR #557 
 - install-script: install rpms from SOS repo #556 
+- iam: implement Org Policy management commands #553
 
 ## 1.74.4
 
 ### Improvements
 
 - publish releases as rpm packages on SOS #555
 
-### Features
-
-- iam: implement Org Policy management commands #553
->>>>>>> ce5e2128 (Update CHANGELOG.md)
-
 ## 1.74.3
 
 ### Improvements