gitignore (solved conflict)

This commit is contained in:
scopesorting 2023-12-19 09:26:55 +01:00 committed by puls200
parent 191aff720b
commit 187f018e26

1
.gitignore vendored
View File

@ -287,6 +287,5 @@ cython_debug/
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore # be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear # and can be added to the global gitignore or merged into this file. For a more nuclear
# 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/
src/notebooks_metz/ src/notebooks_metz/
src/server/editable_requirements.txt src/server/editable_requirements.txt