fix merge conflict

Author: commit111

docs/concepts/defang-byoc.md

@@ -29,10 +29,6 @@ $ export DEFANG_PROVIDER=digitalocean
 
 ## AWS
 
-:::info
-The Public Beta of the v1 Defang BYOC AWS Provider is released as of Feb 1 2024.
-:::
-
 Please read the [AWS Provider](../providers/aws/aws.md) documentation for more details about how the AWS provider works and how to get started.
 
 ## DigitalOcean

docs/faq/warnings-errors.md

@@ -15,7 +15,7 @@ Here are the meanings of common [warning](#warnings) and [error](#errors) messag
 - This message is displayed when you run `defang compose up` and the Compose file references an environment variable that is not set. If you proceed, the environment variable will be empty in the container. If you want to set the environment variable, you should set it in the environment where you run `defang compose up`.
 
 ### "Unsupported platform"
-- This message is displayed when you run `defang compose up` and the Compose file references a platform that is not supported by Defang. Defang Beta only supports Linux operating systems.
+- This message is displayed when you run `defang compose up` and the Compose file references a platform that is not supported by Defang.
 
 ### "not logged in"
 - This message is displayed when you run `defang compose config` but you are not logged in. The displayed configuration will be incomplete. If you want to see the complete configuration, you should log in first using `defang login`.

docs/providers/aws/aws.md

@@ -6,10 +6,6 @@ sidebar_position: 000
 
 # AWS
 
-:::info
-Public Beta of the v1 Defang BYOC AWS Provider is released as of Feb 1 2024.
-:::
-
 Why should you use Defang with AWS? Defang allows you to easily create and manage full, scalable applications with AWS. Defang aims to make it easier to deploy your services to the cloud. Don't waste your time learning the ins and outs of AWS, deciding which of the 200+ services to use, and then writing the infrastructure code to deploy your services, and making sure they are properly secured. Defang does all of that for you.
 
 ## Getting Started