From e20bb9cc978dddfc9d554c02f668ecd586720c77 Mon Sep 17 00:00:00 2001
From: Herbert Maschke <thyseus@pm.me>
Date: Tue, 10 Mar 2020 10:00:04 +0100
Subject: [PATCH] remove <<<<HEAD merge conflict marker artifact

---
 packages/Webkul/Core/src/Helpers/Laravel5Helper.php | 1 -
 1 file changed, 1 deletion(-)
diff --git a/packages/Webkul/Core/src/Helpers/Laravel5Helper.php b/packages/Webkul/Core/src/Helpers/Laravel5Helper.php
index 6a6bda3ad..1a2666014 100644
--- a/packages/Webkul/Core/src/Helpers/Laravel5Helper.php
+++ b/packages/Webkul/Core/src/Helpers/Laravel5Helper.php
@@ -211,7 +211,6 @@ class Laravel5Helper extends Laravel5
     }
 
     /**
-     * <<<<<<< HEAD
      * Set all session with the given key and value in the array.
      *
      * @param array $keyValue
