diff options
Diffstat (limited to 'site/intel-pod15/site-definition.yaml')
-rw-r--r-- | site/intel-pod15/site-definition.yaml | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/site/intel-pod15/site-definition.yaml b/site/intel-pod15/site-definition.yaml index e3cc37e..81f8b17 100644 --- a/site/intel-pod15/site-definition.yaml +++ b/site/intel-pod15/site-definition.yaml @@ -12,10 +12,6 @@ data: repositories: global: -<<<<<<< HEAD (ea42d6 Catch NeutronNetworks.create_and_*routers in blacklist) - revision: v1.8 -======= - revision: 94f354467b7bbe1cd464b7803b3369296ca55e35 ->>>>>>> CHANGE (c79c2e Update treasuremap version to include upstream rbac fixes) + revision: 40c743f7fa715c3c9dc3e3cc4ee21cf6553f2ebb url: https://opendev.org/airship/treasuremap.git ... |