Skip to content

Commit ea96fb0

Browse files
author
Aaron
committed
first fix
first
1 parent da7fa0d commit ea96fb0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+192773
-10
lines changed

‎.gitignore

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,11 @@
2222
#/laravel/yarn-error.log
2323

2424

25+
<<<<<<< HEAD
2526
#/coreui/.DS_Store
27+
=======
28+
##/coreui/.DS_Store
29+
>>>>>>> be2db42... first fix
2630
#/coreui/node_modules
2731
#/coreui/dist
2832
#/coreui/coverage
@@ -35,9 +39,9 @@
3539
#/coreui/.env.*.local
3640

3741
# Log files
38-
/coreui/npm-debug.log*
39-
/coreui/yarn-debug.log*
40-
/coreui/yarn-error.log*
42+
#/coreui/npm-debug.log*
43+
#/coreui/yarn-debug.log*
44+
#/coreui/yarn-error.log*
4145

4246
# Editor directories and files
4347
#/coreui/.idea

‎coreui/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎laravel/.env.example

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@ APP_URL=http://localhost
66

77
LOG_CHANNEL=stack
88

9-
DB_CONNECTION=mysql
10-
DB_HOST=127.0.0.1
11-
DB_PORT=3306
12-
DB_DATABASE=laravel
13-
DB_USERNAME=root
14-
DB_PASSWORD=
9+
DB_CONNECTION=sqlite
10+
DB_DATABASE=database/database.sqlite
1511

1612
BROADCAST_DRIVER=log
1713
CACHE_DRIVER=file

0 commit comments

Comments
 (0)