[3.2.0] Fix merge errors encountered in master merge

wso2 · Aug 28, 2020 · eb0daea · eb0daea
1 parent 89e2a9f
commit eb0daea
Show file tree

Hide file tree

Showing 19 changed files with 208 additions and 746 deletions.
diff --git a/advanced/am-pattern-1/templates/am/instance-1/wso2am-pattern-1-am-conf.yaml b/advanced/am-pattern-1/templates/am/instance-1/wso2am-pattern-1-am-conf.yaml
@@ -1,4 +1,4 @@
-# Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+# Copyright (c) 2020, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ metadata:
 data:
   {{- range $index, $content := .Values.wso2.deployment.am.config }}
   {{ $index }}: |-
-    {{ tpl $content $ | indent 4 }}
+  {{ tpl $content $ | indent 4 }}
   {{- end }}
 
   {{ else }}

diff --git a/advanced/am-pattern-1/templates/am/instance-1/wso2am-pattern-1-am-conf.yaml~HEAD b/advanced/am-pattern-1/templates/am/instance-1/wso2am-pattern-1-am-conf.yaml~HEAD