diff --git a/provider.tf b/provider.tf index 88f0a18..d681839 100644 --- a/provider.tf +++ b/provider.tf @@ -1,3 +1,19 @@ provider "aws" { region = "ap-south-1" -} \ No newline at end of file +<<<<<<< HEAD +} +<<<<<<< HEAD +demo for 26th +i am working on devops +======= +<<<<<<< HEAD +demo for 26th +apple good for health +======= +demo for 26th +>>>>>>> 898aeeb7eccfe797b373719ca89c3134d562903c +======= +} +>>>>>>> parent of 898aeeb (demo for 26) +>>>>>>> 1165908884498f767c2e83fbf15128b163da2887 +i am in bangalore \ No newline at end of file diff --git a/sai b/sai new file mode 100644 index 0000000..f522d69 --- /dev/null +++ b/sai @@ -0,0 +1,2 @@ +working for demo +apple are good for health \ No newline at end of file diff --git a/vpc.tf b/vpc.tf index 175c603..359d38a 100644 --- a/vpc.tf +++ b/vpc.tf @@ -7,3 +7,21 @@ resource "aws_vpc" "main" { Purpose = "Jenkins Demo" } } +<<<<<<< HEAD +demo for 26th +demo for today +apple good for health +demo for 26th +i am working on devops +======= +<<<<<<< HEAD +<<<<<<< HEAD +demo for 26th +demo for today +apple good for health +======= +demo for 26th +>>>>>>> 898aeeb7eccfe797b373719ca89c3134d562903c +======= +>>>>>>> parent of 898aeeb (demo for 26) +>>>>>>> 1165908884498f767c2e83fbf15128b163da2887