merge test

This commit is contained in:
Anish Lakhwara 2023-04-28 11:11:41 +10:00
parent db31d3d4b7
commit a2d85675b9

View file

@ -151,8 +151,6 @@ def test_templates() -> None:
org_template=org_template org_template=org_template
) )
<<<<<<< HEAD
=======
print() print()
print(res) print(res)
res = as_org( res = as_org(
@ -186,4 +184,3 @@ fafewfewf
org_template=vimzettel_template, org_template=vimzettel_template,
) )
assert res == 'zettel %title [hello] testing' assert res == 'zettel %title [hello] testing'
>>>>>>> upstream/master