diff options
| author | Max K <[email protected]> | 2020-07-22 20:07:31 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-07-22 20:07:31 +0200 |
| commit | f933c83b7502c7fa6552966f170313cfef9b40b2 (patch) | |
| tree | 50db323a4a163df425f929c2bb20bf25ca350b3d | |
| parent | Merge pull request #1548 from preserveddarnell/patch-1 (diff) | |
| parent | Get rid of git merge leftover text (diff) | |
| download | discoin-f933c83b7502c7fa6552966f170313cfef9b40b2.tar.xz discoin-f933c83b7502c7fa6552966f170313cfef9b40b2.zip | |
Merge pull request #1605 from greenbigfrog/patch-1
Get rid of git merge leftover text
| -rw-r--r-- | doc/release-notes.md | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/doc/release-notes.md b/doc/release-notes.md index e073f6337..29877d6c5 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -447,8 +447,6 @@ Thanks to everyone who directly contributed to this release: - Gregory Sanders - Jonas Schnelli - Matt Corallo -<<<<<<< HEAD -======= - Matthew King - matthias - Max Keller |