fz0x1/jrnl
1
0
Fork 0
mirror of https://github.com/jrnl-org/jrnl.git synced 2025-06-29 22:16:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix up remnants of merge conflicts

Browse source
This commit is contained in:
Jonathan Wren 2020-03-08 22:11:09 -07:00
parent 507914ff3c
commit 2a4f5ca5c9
2 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -147,4 +147,3 @@ jobs:
- git add pyproject.toml
- git commit -m "Incrementing version to ${TRAVIS_TAG} [ci skip]"
- git push https://${GITHUB_TOKEN}@github.com/jrnl-org/jrnl.git master