fix merge conflict

Author: apcha-oai

requirements-dev.lock

@@ -170,12 +170,8 @@ requests==2.32.5
     # via msal
 respx==0.22.0
 rich==14.2.0
-<<<<<<< HEAD
     # via inline-snapshot
 ruff==0.14.7
-=======
-ruff==0.14.13
->>>>>>> origin/generated--merge-conflict
 six==1.17.0
     # via python-dateutil
 sniffio==1.3.1