Merge error fix

Author: jgrundback

integration-tests/src/test/resources/domain-home-on-pv/create-domain-auto-custom-sit-config.py

@@ -116,6 +116,7 @@ def getEnvVar(var):
   cmo.setCluster(cl)
   print('Done setting attributes for Server Template: %s' % templateName);
 
+
   cd('/Clusters/%s' % cluster_name)
   create(cluster_name, 'DynamicServers')
   cd('DynamicServers/%s' % cluster_name)

kubernetes/samples/scripts/create-weblogic-domain/domain-home-on-pv/wlst/create-domain.py

@@ -102,12 +102,6 @@ def getEnvVar(var):
   cmo.setCluster(cl)
   print('Done setting attributes for Server Template: %s' % templateName);
 
-  templateChannelName = cluster_name + "-NAP"
-  create(templateChannelName, 'NetworkAccessPoint')
-  cd('NetworkAccessPoints/%s' % templateChannelName)
-  set('PublicPort', server_port + 10)
-  set('ListenAddress', '%s-%s${id}' % (domain_uid, managed_server_name_base_svc))
-  set('ListenPort', server_port + 10)
 
   cd('/Clusters/%s' % cluster_name)
   create(cluster_name, 'DynamicServers')