Update gitignore

6 years ago · 8524eaf163
parent 0a82614741
commit 8524eaf163
3 changed files with 2 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,5 +1,5 @@
 vendor
 settings.php
 nbproject/private
-*.sync-conflict*
-database.mwb.bak
+database.mwb.bak
+*.sync-conflict*
--- a/database.mwb
+++ b/database.mwb
--- a/database.mwb.bak
+++ b/database.mwb.bak