From 893fda4abebb3fb4374fe2b1af995d2315eed4e9 Mon Sep 17 00:00:00 2001
From: Pig Fang <g-plane@hotmail.com>
Date: Wed, 27 Feb 2019 10:55:59 +0800
Subject: [PATCH] fix package name

---
 composer.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/composer.json b/composer.json
index 010f6ece..5bba05cd 100644
--- a/composer.json
+++ b/composer.json
@@ -23,7 +23,11 @@
     "laravel/browser-kit-testing": "~4.0",
     "league/flysystem-memory": "^1.0",
     "mikey179/vfsstream": "^1.6.5",
+<<<<<<< HEAD
     "barryvdh/laravel-ide-helper": "^2.6"
+=======
+    "barryvdh/laravel-ide-helper": "^2.4"
+>>>>>>> fix package name
   },
   "autoload": {
     "classmap": [