禁止合并的文件

9ce3f85b · clone · 49f721bf · 9ce3f85b
Commit 9ce3f85b authored May 21, 2018 by clone
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

.gitattributes application/.gitattributes +2 -0

No files found.
--- a/application/.gitattributes
+++ b/application/.gitattributes
+database.php merge=ours
\ No newline at end of file