for_psqlブランチをマージ
This commit is contained in:
parent
20d9d15063
commit
7cfd94053e
1 changed files with 0 additions and 5 deletions
5
.gitignore
vendored
5
.gitignore
vendored
|
@ -160,10 +160,5 @@ cython_debug/
|
|||
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
|
||||
#.idea/
|
||||
|
||||
<<<<<<< HEAD
|
||||
config/*
|
||||
db/*
|
||||
=======
|
||||
config/
|
||||
db/
|
||||
>>>>>>> for_psql
|
||||
|
|
Loading…
Reference in a new issue