Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
Generated changelog for 3.8 release.
- Loading branch information
1 parent
608c1e6
commit a365223
Showing
2 changed files
with
700 additions
and
525 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
# MonoGame - Copyright (C) The MonoGame Team | ||
# This file is subject to the terms and conditions defined in | ||
# file 'LICENSE.txt', which is part of this source code package. | ||
|
||
|
||
# This forces the 3-way merge on the changelog to take lines | ||
# from both versions instead of leaving conflicts to resolve. | ||
CHANGELOG.md -text merge=union |
Oops, something went wrong.