fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-05-17 11:38:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix merge conflicts

Browse source
This commit is contained in:
Jonathan Wren 2022-07-16 13:54:37 -07:00
parent 552c92fe82
commit 2ba21512aa
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
jrnl/config.py
View file

@ -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"