ZeusWPI/endorsement
9
0
Fork 0
Code Issues 2 Pull requests 1 Projects Releases Packages Wiki Activity

Do merge conflicts correctly

Browse source
This commit is contained in:
Robbe Van Herck 2018-11-28 16:04:07 +01:00
parent a078691241
commit 10b81c454f
No known key found for this signature in database
GPG key ID: 4D1C8E8FBD1C7188
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
api.py
View file

@ -3,10 +3,7 @@ from models import User, Achievement
import json import json
from graphviz import Digraph from graphviz import Digraph
<<<<<<< HEAD
from flask import escape from flask import escape
=======
>>>>>>> 4ad2b75835745d3a91007abab4741f5956ba9cbd
@app.route("/api") @app.route("/api")
@app.route("/api/all") @app.route("/api/all")