Fixing YML error

jayair · jayair · commit e8b8df8fbfbf · 2019-01-27T11:46:05.000+05:30
diff --git a/serverless.yml b/serverless.yml
@@ -115,7 +115,6 @@ functions:
           cors: true
           authorizer: aws_iam
 
-<<<<<<< HEAD
   billing:
     handler: billing.main
     events:
