Fixing YML error

AnomalyInnovations · Jan 27, 2019 · e8b8df8 · e8b8df8
1 parent 9a50850
commit e8b8df8
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/serverless.yml b/serverless.yml
@@ -115,7 +115,6 @@ functions:
           cors: true
           authorizer: aws_iam
 
-<<<<<<< HEAD
   billing:
     handler: billing.main
     events: