Topic sk resolve conflicts (#180)

Resolve conflicts between development branch and main branch.

---------

Co-authored-by: telake <[email protected]>
Co-authored-by: Roberto Sanchez Herrera <[email protected]>
Co-authored-by: abhijit-paranjpe <[email protected]>

Author: 4 people

README.md

@@ -359,4 +359,4 @@ https://cloudmarketplace.oracle.com/marketplace/content?contentId=18088784&rende
 [marketplace]: https://docs.oracle.com/iaas/Content/Marketplace/Concepts/marketoverview.htm
 [orm]: https://docs.cloud.oracle.com/iaas/Content/ResourceManager/Concepts/resourcemanager.htm
 [vault]: https://docs.cloud.oracle.com/iaas/Content/KeyManagement/Concepts/keyoverview.htm
-[tf]: https://www.terraform.io
+[tf]: https://www.terraform.io

solutions/jrf/README.md

@@ -74,5 +74,4 @@ To destroy the infrastructure
 ```bash
 terraform destroy var-file=../solutions/common/tenancy.tfvars -var-file=images/mp_image_ee_byol.tfvars -var-file=../solutions/jrf/jrf_instance.tfvars -var-file=../solutions/jrf/existing_lb.tfvars -var-file=../solutions/jrf/idcs.tfvars var-file=../solutions/jrf/oci_db.tfvars
 ```
-**Important:** Refer to [documentation](https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/delete-domain.html) for
-steps to perform before running *terraform destroy*.
+**Important:** Refer to [documentation](https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/delete-domain.html) for steps to perform before running *terraform destroy*.

solutions/non_jrf/README.md

@@ -62,10 +62,11 @@ Update the variable values in tfvars files under directories terraform/solutions
 according to the user specific values.
 Invoke apply passing all *.tfvars files as input
 ```bash
-terraform apply -var-file=../solutions/common/tenancy.tfvars -var-file=images/mp_image_ee_byol.tfvars -var-file=../solutions/non_jrf/nonjrf_instance.tfvars -var-file=../solutions/non_jrf /lb.tfvars -var-file=../solutions/non_jrf/fss.tfvars
+terraform apply -var-file=../solutions/common/tenancy.tfvars -var-file=images/mp_image_ee_byol.tfvars -var-file=../solutions/non_jrf/nonjrf_instance.tfvars -var-file=../solutions/non_jrf/lb.tfvars -var-file=../solutions/non_jrf/fss.tfvars
 ```
 
 To destroy the infrastructure
 ```bash
-terraform destroy -var-file=../solutions/common/tenancy.tfvars -var-file=../solutions/common/mp_byol.tfvars -var-file=../solutions/non_jrf/nonjrf_instance.tfvars -var-file=../solutions/non_jrf/lb.tfvars -var-file=../solutions/non_jrf/fss.tfvars
-```
+terraform destroy -var-file=../solutions/common/tenancy.tfvars -var-file=images/mp_image_ee_byol.tfvars -var-file=../solutions/non_jrf/nonjrf_instance.tfvars -var-file=../solutions/non_jrf/lb.tfvars -var-file=../solutions/non_jrf/fss.tfvars
+```
+**Important:** Refer to [documentation](https://docs.oracle.com/en/cloud/paas/weblogic-cloud/user/delete-domain.html) for steps to perform before running *terraform destroy*.