diff options
| author | Jonathan <[email protected]> | 2019-08-05 21:51:05 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-08-05 21:51:05 +0200 |
| commit | 8877f8ed912b43fce29b48d5b7df3c099f52500a (patch) | |
| tree | 6142bcc236fcf8052085ca99c0b32562b3442dee | |
| parent | Merge pull request #1587 from langerhans/master (diff) | |
| download | discoin-8877f8ed912b43fce29b48d5b7df3c099f52500a.tar.xz discoin-8877f8ed912b43fce29b48d5b7df3c099f52500a.zip | |
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 807e978ec..b0a654158 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 |