diff --git a/server/org_tools.py b/server/org_tools.py index 7fc8a50..7ff74e1 100644 --- a/server/org_tools.py +++ b/server/org_tools.py @@ -151,8 +151,6 @@ def test_templates() -> None: org_template=org_template ) -<<<<<<< HEAD -======= print() print(res) res = as_org( @@ -186,4 +184,3 @@ fafewfewf org_template=vimzettel_template, ) assert res == 'zettel %title [hello] testing' ->>>>>>> upstream/master