From e3a751cfc1e8d9d8667713cc7ecfdb074f2cc496 Mon Sep 17 00:00:00 2001 From: Jana Vrbkova Date: Thu, 19 Oct 2023 11:20:16 +0200 Subject: [PATCH] fix merge conflicts --- .../examples/snip_che-setting-up-ansible-sample.adoc | 0 .../pages/installing-che-in-a-restricted-environment.adoc | 2 ++ 2 files changed, 2 insertions(+) create mode 100644 modules/administration-guide/examples/snip_che-setting-up-ansible-sample.adoc diff --git a/modules/administration-guide/examples/snip_che-setting-up-ansible-sample.adoc b/modules/administration-guide/examples/snip_che-setting-up-ansible-sample.adoc new file mode 100644 index 0000000000..e69de29bb2 diff --git a/modules/administration-guide/pages/installing-che-in-a-restricted-environment.adoc b/modules/administration-guide/pages/installing-che-in-a-restricted-environment.adoc index 62b21f68e1..135f6d10fd 100644 --- a/modules/administration-guide/pages/installing-che-in-a-restricted-environment.adoc +++ b/modules/administration-guide/pages/installing-che-in-a-restricted-environment.adoc @@ -37,3 +37,5 @@ $ {prod-cli} server:deploy \ . Allow incoming traffic from the {prod-short} namespace to all Pods in the user {orch-namespace}s. See: xref:configuring-network-policies.adoc[]. include::partial$snip_installing-che-in-a-restricted-environment-additional-resources.adoc[] + +include::partial$snip_che-setting-up-ansible-sample.adoc[]