From 2ba21512aa6a18dcea729b008470ffdd2fa6ddf7 Mon Sep 17 00:00:00 2001
From: Jonathan Wren <jonathan@nowandwren.com>
Date: Sat, 16 Jul 2022 13:54:37 -0700
Subject: [PATCH] fix merge conflicts

---
 jrnl/config.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/jrnl/config.py b/jrnl/config.py
index 732de25c..cea3720e 100644
--- a/jrnl/config.py
+++ b/jrnl/config.py
@@ -5,10 +5,9 @@ import logging
 import os
 
 import colorama
-from ruamel.yaml import YAML
-from ruamel.yaml import constructor
 import xdg.BaseDirectory
 from ruamel.yaml import YAML
+from ruamel.yaml import constructor
 
 from jrnl import __version__
 from jrnl.exception import JrnlException
@@ -19,7 +18,6 @@ from jrnl.output import list_journals
 from jrnl.output import print_msg
 from jrnl.path import home_dir
 
-
 # Constants
 DEFAULT_CONFIG_NAME = "jrnl.yaml"
 XDG_RESOURCE = "jrnl"