updated compose

app/__init__.py

@@ -18,6 +18,7 @@ def index():
     md_content = "# Welcome to my blog!\nThis is rendered from **Markdown**.\n##[test](http://localhost/test)"
     html_content = markdown.markdown(md_content)
     return html_content
+<<<<<<< HEAD
 @app.route("/api/vault-update") #webhook for vault updated
 def update_vault():
 # TODO SECURE THIS WITH SECRETTTTT or auth header
@@ -26,6 +27,9 @@ def update_vault():
 
 
 
+=======
+@app.route("/api/push") #webhook for vault updated
+>>>>>>> 399920b (updated compose)
 
 @app.route ("/<filename>") # renders a filename if not otherwise specified
 def render_post(filename):