From 50decb81cb972fc37d6c32c871ce02ed2af773ad Mon Sep 17 00:00:00 2001
From: Pranshu Tomar <pranshutomar@Pranshus-MacBook-Air.local>
Date: Tue, 24 Mar 2020 16:25:10 +0530
Subject: [PATCH] Conflicts resolved

---
 packages/Webkul/Velocity/publishable/assets/mix-manifest.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/packages/Webkul/Velocity/publishable/assets/mix-manifest.json b/packages/Webkul/Velocity/publishable/assets/mix-manifest.json
index d1b571102..4fc09f77c 100644
--- a/packages/Webkul/Velocity/publishable/assets/mix-manifest.json
+++ b/packages/Webkul/Velocity/publishable/assets/mix-manifest.json
@@ -1,9 +1,5 @@
 {
     "/js/velocity.js": "/js/velocity.js?id=d3f7d56e990550452f19",
     "/css/velocity-admin.css": "/css/velocity-admin.css?id=612d35e452446366eef7",
-<<<<<<< HEAD
     "/css/velocity.css": "/css/velocity.css?id=d047a8c4cfcb4ce793e3"
-=======
-    "/css/velocity.css": "/css/velocity.css?id=52109e4f344a8b0bce61"
->>>>>>> e6e84dfdf9e8125b3ebf5afdd139a420ad256f35
 }