WIP: Fixing issue with charm

canonical · Sep 13, 2023 · 5c550ea · 5c550ea
1 parent a4b6484
commit 5c550ea
Show file tree

Hide file tree

Showing 10 changed files with 476 additions and 80 deletions.
diff --git a/requirements.txt b/requirements.txt
@@ -4,15 +4,23 @@ cosl==0.0.5
 importlib-resources==5.10.2
 tenacity==8.1.0
 pymongo==4.3.3
+<<<<<<< HEAD
 ops==2.4.1
+=======
+ops==2.4.0
+>>>>>>> 008665e (WIP: Fixing issue with charm)
 jsonschema==4.17.3
 cryptography==38.0.4
 pure-sasl==0.6.2
 pycparser==2.2
 pkgutil-resolve-name==1.3.10
 pydantic==1.10.7
 pyrsistent==0.19.3 
+<<<<<<< HEAD
 pyyaml==6.0.1
+=======
+pyyaml > 6.0
+>>>>>>> 008665e (WIP: Fixing issue with charm)
 zipp==3.11.0
 pyOpenSSL==22.1.0
 typing-extensions==4.5.0