External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-07-05 21:38:03 -02:30
Code Issues Packages Projects Releases Wiki Activity

rebase and merge conflict resolution (#6692)

Browse Source
This commit is contained in:
Jake Jackson
2024-09-17 12:46:12 -04:00
committed by GitHub
parent d2f3c02945
commit fafed924e3
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
requirements/requirements.txt
View File

@@ -213,7 +213,7 @@ importlib-metadata==6.2.1
# ansible-runner
# markdown
# opentelemetry-api
incremental==22.10.0
incremental==24.7.2
# via twisted
inflect==7.0.0
# via jaraco-text
@@ -519,12 +519,13 @@ tempora==5.5.1
# jaraco-logging
tomli==2.0.1
# via
# incremental
# maturin
# setuptools-rust
# setuptools-scm
twilio==8.13.0
# via -r /awx_devel/requirements/requirements.in
twisted[tls]==23.10.0
twisted[tls]==24.7.0
# via
# -r /awx_devel/requirements/requirements.in
# daphne
@@ -580,6 +581,7 @@ setuptools==69.0.2
# -r /awx_devel/requirements/requirements.in
# asciichartpy
# autobahn
# incremental
# opentelemetry-instrumentation
# python-daemon
# setuptools-rust