fix docs

vmanilo · Dec 3, 2023 · 6e33622 · 6e33622
1 parent c42baa8
commit 6e33622
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/docs/resources/resource.md b/docs/resources/resource.md
@@ -34,25 +34,21 @@ resource "twingate_service_account" "github_actions_prod" {
   name = "Github Actions PROD"
 }
 
-<<<<<<< HEAD
 data "twingate_security_policy" "mfa" {
   name = "Default Policy"
-=======
+}
+
 data "twingate_security_policy" "test_policy" {
   name = "Test Policy"
->>>>>>> feature/convert-resource-object
 }
 
 resource "twingate_resource" "resource" {
   name = "network"
   address = "internal.int"
   remote_network_id = twingate_remote_network.aws_network.id
 
-<<<<<<< HEAD
-=======
   security_policy_id = data.twingate_security_policy.test_policy.id
 
->>>>>>> feature/convert-resource-object
   protocols = {
     allow_icmp = true
     tcp = {

diff --git a/examples/resources/twingate_resource/resource.tf b/examples/resources/twingate_resource/resource.tf
@@ -19,25 +19,21 @@ resource "twingate_service_account" "github_actions_prod" {
   name = "Github Actions PROD"
 }
 
-<<<<<<< HEAD
 data "twingate_security_policy" "mfa" {
   name = "Default Policy"
-=======
+}
+
 data "twingate_security_policy" "test_policy" {
   name = "Test Policy"
->>>>>>> feature/convert-resource-object
 }
 
 resource "twingate_resource" "resource" {
   name = "network"
   address = "internal.int"
   remote_network_id = twingate_remote_network.aws_network.id
 
-<<<<<<< HEAD
-=======
   security_policy_id = data.twingate_security_policy.test_policy.id
 
->>>>>>> feature/convert-resource-object
   protocols = {
     allow_icmp = true
     tcp = {