for_psqlブランチをマージ

This commit is contained in:
suti7yk5032 2024-06-04 23:06:03 +09:00
parent 20d9d15063
commit 7cfd94053e

5
.gitignore vendored
View file

@ -160,10 +160,5 @@ cython_debug/
# option (not recommended) you can uncomment the following to ignore the entire idea folder. # option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/ #.idea/
<<<<<<< HEAD
config/*
db/*
=======
config/ config/
db/ db/
>>>>>>> for_psql