유명현

resolve conflict

...@@ -435,4 +435,7 @@ cython_debug/ ...@@ -435,4 +435,7 @@ cython_debug/
435 # Ignore code-workspaces 435 # Ignore code-workspaces
436 *.code-workspace 436 *.code-workspace
437 437
438 +# Ignore .env file
439 +.env
440 +
438 # End of https://www.toptal.com/developers/gitignore/api/jetbrains,visualstudiocode,python,node 441 # End of https://www.toptal.com/developers/gitignore/api/jetbrains,visualstudiocode,python,node
...\ No newline at end of file ...\ No newline at end of file
......