忽略合并

a3e4cb90 · clone · edb29b6a · a3e4cb90
Commit a3e4cb90 authored Jan 24, 2018 by clone
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

.gitignore .gitignore +1 -1

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