From a2d85675b930ffc26f6891b2e14491795907be4e Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Fri, 28 Apr 2023 11:11:41 +1000 Subject: [PATCH] merge test --- server/org_tools.py | 3 --- 1 file changed, 3 deletions(-) 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