Merge commits from rebase

Author: Theodore Siu

examples/logs-slack-alerts/main.tf

@@ -24,7 +24,6 @@ module "log_slack_alerts_example" {
   providers = {
     google = "google-beta"
   }
-<<<<<<< HEAD
   source                            = "../../"
   project_id                        = "${var.project_id}"
   job_name                          = "logs_query"
@@ -38,22 +37,6 @@ module "log_slack_alerts_example" {
   topic_name                        = "logs_query_topic"
   function_runtime                  = "python37"
   function_environment_variables    = {
-=======
-
-  source                    		= "../../"
-  project_id                		= "${var.project_id}"
-  job_name                  		= "logs_query"
-  job_description					= "Scheduled time to run audit query to check for errors"
-  job_schedule              		= "55 * * * *"
-  function_entry_point      		= "query_for_errors"
-  function_source_directory 		= "${path.module}/function_source"
-  function_name             		= "logs_query_alerting"
-  function_description				= "Cloud Function to query audit logs for errors"
-  region                    		= "${var.region}"
-  topic_name                		= "logs_query_topic"
-  function_runtime              = "python37"
-  function_environment_variables	= {
->>>>>>> 0dca521... Update main.tf
     SLACK_WEBHOOK = "${var.slack_webhook}", 
     DATASET_NAME  = "${var.dataset_name}", 
     AUDIT_LOG_TABLE = "${var.audit_log_table}",