chore: fix merge conflicts

.github/dependabot.yml

@@ -0,0 +1,8 @@
+version: 2
+updates:
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+      day: "sunday"
+    target-branch: "develop"

CHANGELOG.md

@@ -1,3 +1,15 @@
+## [1.2.13](https://github.com/Chia-Network/cadt-ui/compare/1.2.12...1.2.13) (2024-02-27)
+
+
+
+## [1.2.12](https://github.com/Chia-Network/cadt-ui/compare/1.2.11...1.2.12) (2024-02-26)
+
+
+
+## [1.2.11](https://github.com/Chia-Network/cadt-ui/compare/1.2.10...1.2.11) (2024-02-21)
+
+
+
 ## [1.2.10](https://github.com/Chia-Network/cadt-ui/compare/1.2.9...1.2.10) (2024-02-09)
 
 

LICENSE

@@ -1,16 +1,3 @@
-Copyright 2024 Chia Network Inc.
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-
-You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and limitations under the License.
-
-
                                 Apache License
                            Version 2.0, January 2004
                         http://www.apache.org/licenses/

README.md

@@ -50,6 +50,11 @@ The CADT UI can be hosted as a web application, either for internal use, or made
 
 To host the UI on the web, use the [web-build.tar.gz file from the releases page](https://github.com/Chia-Network/cadt-ui/releases). One of the simplest solutions is to uncompress these files into a [public S3 bucket](https://docs.aws.amazon.com/AmazonS3/latest/userguide/WebsiteAccessPermissionsReqd.html). These files could also be served by any webserver, such as Nginx or Apache.  
 
+To make the CADT UI web application automatically connect to a CADT host by default, build the application from source (`npm install && npm run build`) with the following environment variables set:
+
+* `REACT_APP_API_HOST`:  Set to the URL of the CADT API, including the `/v1` path.  For example: `https://www.example.com:31310/v1`  
+* `REACT_APP_APP_URL`:  Set to the URL of the UI application.  
+
 ### From Source
 
 ```