Commit 3cdddb0a authored by intrigeri's avatar intrigeri
Browse files

Changelog: fix buggy merge conflict resolution

parent ae93d97d
tails (4.5) UNRELEASED; urgency=medium
* Dummy entry for next major release
......@@ -90,7 +89,6 @@ tails (4.3) unstable; urgency=medium
and trains us to ignore problems.
-- Tails developers <tails@boum.org> Mon, 10 Feb 2020 14:08:59 +0100
>>>>>>> stable
tails (4.2.2) unstable; urgency=medium
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment