Commit a3e4cb90 authored by clone's avatar clone

忽略合并

parent edb29b6a
...@@ -3,5 +3,5 @@ composer.lock ...@@ -3,5 +3,5 @@ composer.lock
*.log *.log
vendor/* vendor/*
runtime/* runtime/*
application/database.php merge=ours
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment