Skip to content

C
crud-animais-fazenda
Commit 6a985405 by Nicoly Aparecida Lopes
Options

Resolvendo conflitos de merge

parents 0b066048 e3d831ad
Showing with 3 additions and 0 deletions
app.py
...@@ -56,5 +56,8 @@ def excluir(id): ...@@ -56,5 +56,8 @@ def excluir(id):
if __name__ == '__main__': if __name__ == '__main__':
app.run(debug=True) app.run(debug=True)
<<<<<<< HEAD
=======
>>>>>>> e3d831ad8037a3ec094776ee49865c0e6f874550
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment