# HG changeset patch
# User Björn Ricks <bjoern.ricks@intevation.de>
# Date 1411999196 -7200
# Node ID c289263e1b247b485684b3318575c70692366bdc
# Parent  2f627039d2b4106714455873826e9c2657e40a33
Add url rule for new MergeView

diff -r 2f627039d2b4 -r c289263e1b24 main.py
--- a/main.py	Mon Sep 29 15:59:36 2014 +0200
+++ b/main.py	Mon Sep 29 15:59:56 2014 +0200
@@ -10,7 +10,7 @@
 if app.config["DEBUG"]:
     logging.basicConfig(level=logging.DEBUG)
 
-from odfcast.convert import ConvertView, TemplateConvertView
+from odfcast.convert import ConvertView, TemplateConvertView, MergeView
 
 
 app.add_url_rule("/convert/",
@@ -27,6 +27,9 @@
                      app.config["PY3O_UNO_SERVER_HOSTNAME"],
                      app.config["PY3O_UNO_SERVER_PORT"],
                  ))
+app.add_url_rule("/merge/",
+                 view_func=MergeView.as_view("merge"),
+                 )
 
 if __name__ == "__main__":
     app.run()