Security++

2018-11-28 16:02:38 +01:00 · 2018-11-28 16:02:38 +01:00 · a078691241
parent 148f811d94 4ad2b75835
commit a078691241
1 changed files with 3 additions and 0 deletions
--- a/api.py
+++ b/api.py
@ -3,7 +3,10 @@ from models import User, Achievement

 import json
 from graphviz import Digraph
+<<<<<<< HEAD
 from flask import escape
+=======
+>>>>>>> 4ad2b75835745d3a91007abab4741f5956ba9cbd

@app.route("/api")
@app.route("/api/all")