Skip to content

Commit bf39469

Browse files
committed
Reformatted a file
1 parent 55ade20 commit bf39469

File tree

1 file changed

+0
-35
lines changed

1 file changed

+0
-35
lines changed

test/fixtures/workload_metadata_config/example.tf

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,6 @@
1717
module "example" {
1818
source = "../../../examples/workload_metadata_config"
1919

20-
<<<<<<< HEAD
21-
<<<<<<< HEAD
22-
<<<<<<< HEAD
23-
<<<<<<< HEAD
24-
=======
25-
>>>>>>> 5258f89... Removing a few conflicting files.
26-
=======
27-
>>>>>>> 244108e... Removing a few conflicting files.
28-
=======
29-
>>>>>>> 5258f89... Removing a few conflicting files.
3020
project_id = var.project_id
3121
cluster_name_suffix = "-${random_string.suffix.result}"
3222
region = var.region
@@ -35,30 +25,5 @@ module "example" {
3525
subnetwork = google_compute_subnetwork.main.name
3626
ip_range_pods = google_compute_subnetwork.main.secondary_ip_range[0].range_name
3727
ip_range_services = google_compute_subnetwork.main.secondary_ip_range[1].range_name
38-
<<<<<<< HEAD
39-
<<<<<<< HEAD
40-
<<<<<<< HEAD
41-
=======
42-
project_id = var.project_id
43-
cluster_name_suffix = "-${random_string.suffix.result}"
44-
region = var.region
45-
zones = slice(var.zones, 0, 1)
46-
network = google_compute_network.main.name
47-
subnetwork = google_compute_subnetwork.main.name
48-
ip_range_pods = google_compute_subnetwork.main.secondary_ip_range[0].range_name
49-
ip_range_services = google_compute_subnetwork.main.secondary_ip_range[1].range_name
50-
<<<<<<< HEAD
51-
<<<<<<< HEAD
52-
>>>>>>> d791335... Removed the custom test for create_service_account
53-
=======
54-
>>>>>>> 5258f89... Removing a few conflicting files.
55-
=======
56-
>>>>>>> e7f04bb... Removed the custom test for create_service_account
57-
=======
58-
>>>>>>> 244108e... Removing a few conflicting files.
59-
=======
60-
>>>>>>> d791335... Removed the custom test for create_service_account
61-
=======
62-
>>>>>>> 5258f89... Removing a few conflicting files.
6328
registry_project_id = var.registry_project_id
6429
}

0 commit comments

Comments
 (0)