chore: fix merge conflicts

Author: gberenice

.trunk/trunk.yaml

@@ -2,11 +2,11 @@
 # To learn more about the format of this file, see https://docs.trunk.io/reference/trunk-yaml
 version: 0.1
 cli:
-  version: 1.22.3
+  version: 1.22.8
 plugins:
   sources:
     - id: trunk
-      ref: v1.6.1
+      ref: v1.6.4
       uri: https://github.com/trunk-io/plugins
 runtimes:
   enabled:
@@ -15,19 +15,19 @@ runtimes:
     - [email protected]
 lint:
   enabled:
-    - [email protected].1
+    - [email protected].5
     - [email protected]
-    - [email protected].1
-    - [email protected].228
+    - [email protected].4
+    - [email protected].282
     - git-diff-check
-    - markdownlint@0.41.0
+    - markdownlint@0.42.0
     - [email protected]
     - [email protected]
     - [email protected]
     - [email protected]
-    - tflint@0.52.0
-    - trivy@0.54.1
-    - trufflehog@3.81.9
+    - tflint@0.53.0
+    - trivy@0.56.2
+    - trufflehog@3.83.5
     - [email protected]
   ignore:
     - linters: [shellcheck]

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.4.0](https://github.com/masterpointio/terraform-aws-tailscale/compare/v1.3.0...v1.4.0) (2024-08-20)
+
+
+### Features
+
+* support extra arguments ([#28](https://github.com/masterpointio/terraform-aws-tailscale/issues/28)) ([6ff5059](https://github.com/masterpointio/terraform-aws-tailscale/commit/6ff5059a5c4a1efa0b3c81b6f92a42ee5f165e3d))
+
 ## [1.3.0](https://github.com/masterpointio/terraform-aws-tailscale/compare/1.2.0...v1.3.0) (2024-08-13)
 
 

README.md

@@ -71,9 +71,9 @@ Here is an example of using this module:
 
 ## Providers
 
-| Name                                                               | Version |
-| ------------------------------------------------------------------ | ------- |
-| <a name="provider_tailscale"></a> [tailscale](#provider_tailscale) | 0.17.2  |
+| Name                                                               | Version   |
+| ------------------------------------------------------------------ | --------- |
+| <a name="provider_tailscale"></a> [tailscale](#provider_tailscale) | >= 0.13.7 |
 
 ## Modules