fix merge conflicts

eclipse-che · Oct 19, 2023 · e3a751c · e3a751c
1 parent 6d57c7d
commit e3a751c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
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
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
@@ -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[]
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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[]