cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

conflict fix

Browse Source 
all conflict fixed
This commit is contained in:
Sujit Prasad
2016-08-03 21:19:11 +05:30
parent ffa56a43cb e90c764c88
commit 18af857291
9 changed files with 23 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -3,12 +3,9 @@
example.env
Homestead.yaml
Homestead.json
/app/config/
/app/Plugins/Reseller/
/app/Plugins/
/app/Plugins/ServiceDesk/
/config/app.php
/config/database.php
/config/lfm.php
/nbproject/private/
/node_modules