diff --git a/defaults/main.yml b/defaults/main.yml index 65dce89e..36dfb571 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -430,6 +430,10 @@ horizon_listen_ports: horizon_pip_packages: - "git+{{ horizon_git_repo }}@{{ horizon_git_install_branch }}#egg=horizon" +<<<<<<< HEAD (a30d52 Do not change mode of files recursively) +======= + - "git+{{ openstack_github_base_url }}/Kronuz/pyScss@60414f5d573315a8458b5fbcdf69e5c648c44a9a" # needed for python>=3.11 +>>>>>>> CHANGE (ec4b2b Use overridable URL for github rather than hard-coding) - pymemcache - python-memcached