database

7ef555ce · clone · 9421df11 · 7ef555ce · 7ef555ce · 7ef555ce
Commit 7ef555ce authored Jan 24, 2018 by clone
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

.gitignore .gitignore +1 -1

.gitignore application/.gitignore +2 -0

database.php application/database.php +0 -3

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,5 @@ composer.lock
 *.log
 vendor/*
 runtime/*
-application/database.php merge=ours
+

--- a/application/.gitignore
+++ b/application/.gitignore
+database.php merge=ours
+
--- a/application/database.php
+++ b/application/database.php
@@ -51,5 +51,3 @@ return [
    // 是否需要进行SQL性能分析
    'sql_explain'     => false,
 ];
-
-///------------
\ No newline at end of file