From 18932c03c5d6bc25eff0326812f7b96fa1af7482 Mon Sep 17 00:00:00 2001
From: lonetrinity <psychixkilax@com>
Date: Thu, 19 Jul 2018 12:18:54 +0800
Subject: [PATCH] fix conflig

---
 .gitignore | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 083d134e..a81c252b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,4 @@ yarn-error.log
 vendor/composer/autoload_static.php
 vendor/composer/autoload_classmap.php
 package-lock.json
-*.lock
-
-
+*.lock
\ No newline at end of file