Skip to content

Commit 640dffe

Browse files
committed
Fix borked merge in changelog
1 parent d050271 commit 640dffe

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

CHANGELOG.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2176,10 +2176,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
21762176
[#2772]: https://github.com/JuliaDocs/Documenter.jl/issues/2772
21772177
[#2773]: https://github.com/JuliaDocs/Documenter.jl/issues/2773
21782178
[#2774]: https://github.com/JuliaDocs/Documenter.jl/issues/2774
2179-
<<<<<<< HEAD
21802179
[#2787]: https://github.com/JuliaDocs/Documenter.jl/issues/2787
2181-
=======
2182-
>>>>>>> aeb9542e0 (Add changelog)
21832180
[#2792]: https://github.com/JuliaDocs/Documenter.jl/issues/2792
21842181
[JuliaLang/julia#36953]: https://github.com/JuliaLang/julia/issues/36953
21852182
[JuliaLang/julia#38054]: https://github.com/JuliaLang/julia/issues/38054

0 commit comments

Comments
 (0)