From 22409ffef410553c3e3b8f4285d633555375390b Mon Sep 17 00:00:00 2001 From: Jonathan Wren Date: Sat, 25 Mar 2023 12:02:01 -0700 Subject: [PATCH] fix merge conflict typo --- jrnl/controller.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jrnl/controller.py b/jrnl/controller.py index 9902faca..dfc76774 100644 --- a/jrnl/controller.py +++ b/jrnl/controller.py @@ -278,7 +278,7 @@ def _write_in_editor(config: dict, prepopulated_text: str | None = None) -> str: -def _filter_journal_entries(args: "Namespace", journal: Journal, **kwargs) -> None: +def _filter_journal_entries(args: "Namespace", journal: "Journal", **kwargs) -> None: """Filter journal entries in-place based upon search args""" if args.on_date: args.start_date = args.end_date = args.on_date