fix: resolve merge conflict in __init__.py version

Author: ccantillo

openedx_authz/__init__.py

@@ -4,10 +4,6 @@
 
 import os
 
-<<<<<<< HEAD
-__version__ = "1.8.0"
-=======
 __version__ = "1.9.0"
->>>>>>> a27765f (chore: bump version to 1.6.0 and update CHANGELOG)
 
 ROOT_DIRECTORY = os.path.dirname(os.path.abspath(__file__))