squash!: Fix conflicts

Author: rodmgwgu

CHANGELOG.rst

@@ -16,6 +16,14 @@ Unreleased
 
 *
 
+0.17.0 - 2025-11-14
+********************
+
+Added
+=====
+
+* Migration to transfer legacy permissions from ContentLibraryPermission to the new Casbin-based authorization model.
+
 0.16.0 - 2025-11-13
 ********************
 
@@ -30,14 +38,6 @@ Added
 * Register ``CasbinRule`` model in the Django admin.
 * Register ``ExtendedCasbinRule`` model in the Django admin as an inline model of ``CasbinRule``.
 
-0.16.0 - 2025-11-14
-********************
-
-Added
-=====
-
-* Migration to transfer legacy permissions from ContentLibraryPermission to the new Casbin-based authorization model.
-
 0.15.0 - 2025-11-11
 ********************
 

openedx_authz/__init__.py

@@ -4,6 +4,6 @@
 
 import os
 
-__version__ = "0.16.0"
+__version__ = "0.17.0"
 
 ROOT_DIRECTORY = os.path.dirname(os.path.abspath(__file__))