fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-07-04 23:46:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Manually resolve merge conficts

Browse source
This commit is contained in:
MinchinWeb 2021-05-09 14:02:36 -06:00
commit c8ca3a0358
12 changed files with 190 additions and 146 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pyproject.toml
View file

@ -1,6 +1,6 @@
[tool.poetry]
name = "jrnl"
version = "v2.7.2-beta"
version = "v2.8.1"
description = "Collect your thoughts and notes without leaving the command line."
authors = [
"jrnl contributors <jrnl-sh@googlegroups.com>",
@ -47,7 +47,7 @@ tzlocal = ">2.0, <3.0" # https://github.com/regebro/tzlocal/blob/master/CHANGE
behave = "^1.2"
mkdocs = "^1.0"
mkdocs-include-markdown-plugin = "^2.8.0"
black = {version = "^20.8b1",allow-prereleases = true}
black = {version = "^21.5b0",allow-prereleases = true}
toml = ">=0.10"
pyflakes = ">=2.2.0"
pytest = ">=6.2"