ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

fixup to 70b517c: remove errant conflict marker

Browse source
This commit is contained in:
Ilya Grigoriev 2024-05-05 18:51:18 -07:00
parent 70b517ca64
commit 3cf521fb41
1 changed files with 0 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -21,8 +21,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Conflict markers now include an explanation of what each part of the conflict * Conflict markers now include an explanation of what each part of the conflict
represents. represents.
>>>>>>>
### Fixed bugs ### Fixed bugs
## [0.17.0] - 2024-05-01 ## [0.17.0] - 2024-05-01