terribleplan/mangadex_at_home
1
0
Fork 0
forked from gitlab-com-mangadex-pub/mangadex_at_home
Code Issues Pull requests Releases Wiki Activity

Added .gitattributes to help sort out CHANGELOG.md merge conflicts

Browse source
This commit is contained in:
Amos Ng 2020-06-14 05:03:53 +08:00
parent 4986bfb003
commit 6e2353307f
No known key found for this signature in database
GPG key ID: 89086414F634D123
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitattributes vendored Executable file
View file

@ -0,0 +1 @@
CHANGELOG.md merge=union

1
CHANGELOG.md
View file

@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Added ### Added
- [2020-06-13] Allow for the two log levels to be configurable by [@lflare]. - [2020-06-13] Allow for the two log levels to be configurable by [@lflare].
- [2020-06-13] Added X-Cache header to image responses by [@lflare]. - [2020-06-13] Added X-Cache header to image responses by [@lflare].
- [2020-06-13] Added .gitattributes to help sort out CHANGELOG.md merge conflicts by [@lflare].
### Changed ### Changed
- [2020-06-13] Modified AsyncAppender queue size to 1024 by [@lflare]. - [2020-06-13] Modified AsyncAppender queue size to 1024 by [@lflare].