From e8b8df8fbfbf3ff3c8ae57d0b199e8591d27db1a Mon Sep 17 00:00:00 2001
From: Jay <jvelayud@gmail.com>
Date: Sun, 27 Jan 2019 11:46:05 +0530
Subject: [PATCH] Fixing YML error

---
 serverless.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/serverless.yml b/serverless.yml
index 405c89c..4be9230 100644
--- a/serverless.yml
+++ b/serverless.yml
@@ -115,7 +115,6 @@ functions:
           cors: true
           authorizer: aws_iam
 
-<<<<<<< HEAD
   billing:
     handler: billing.main
     events: