From 586962d8bae2ded0b5280912572a3cd165c74f57 Mon Sep 17 00:00:00 2001
From: tmdh <tarequemd.hanif@yahoo.com>
Date: Sat, 1 Aug 2020 10:30:31 +0600
Subject: [PATCH] Remove <<<

---
 app/js/index.js | 12 ------------
 yarn.lock       |  5 +++++
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/app/js/index.js b/app/js/index.js
index 547efdc..455f884 100644
--- a/app/js/index.js
+++ b/app/js/index.js
@@ -290,30 +290,18 @@ function newProject () {
 		properties: ["openDirectory", "createDirectory"]
 	}, (folderPath) => {
 		if(folderPath !== undefined) {
-<<<<<<< Updated upstream
-			extract('app/zip/laravel.zip', {dir: folderPath[0]}, (err) => {
-=======
 			extract(filePath('laravel-5.8.zip'), {dir: folderPath[0]}, (err) => {
->>>>>>> Stashed changes
 				if(err !== undefined) {
 					ae(err.message)
 				} else {
 					changeStatusToWait("Extracted Laravel 5.8")
 					var vendorZips = []
-<<<<<<< Updated upstream
-					fs.readdirSync("app/zip/vendors/").forEach(zipFile => {
-=======
 					fs.readdirSync(filePath("vendors-5.8/")).forEach(zipFile => {
->>>>>>> Stashed changes
 					 	vendorZips.push(zipFile)
 					})
 					var extractCount = 0
 					for(var i = 0; i < vendorZips.length; i++) {
-<<<<<<< Updated upstream
-						extract('app/zip/vendors/' + vendorZips[i], {dir: folderPath[0] + '/vendor'}, (err) => {
-=======
 						extract(filePath('vendors-5.8/' + vendorZips[i]), {dir: folderPath[0] + '/vendor'}, (err) => {
->>>>>>> Stashed changes
 							if(err !== undefined) {
 								changeStatus(err)
 								ae(err)
diff --git a/yarn.lock b/yarn.lock
index e052540..7f2fcd2 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -22,6 +22,11 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
+adm-zip@^0.4.13:
+  version "0.4.16"
+  resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.16.tgz#cf4c508fdffab02c269cbc7f471a875f05570365"
+  integrity sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==
+
 aggregate-error@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-1.0.0.tgz#888344dad0220a72e3af50906117f48771925fac"