diff options
| author | Clinton Gormley <clint@traveljury.com> | 2017-05-25 13:43:40 +0200 |
|---|---|---|
| committer | Clinton Gormley <clint@traveljury.com> | 2017-05-25 13:43:44 +0200 |
| commit | f90431f26ef7ca4636b386225e142a53f6be2ebf (patch) | |
| tree | 028d5406711ccb92ccdf4b780b62d5828f09a5e0 | |
| parent | f3bf2594ecd68fe992285b5a1836aaabb53f9a7e (diff) | |
Fixed bad merge
| -rw-r--r-- | docs/reference/release-notes.asciidoc | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/docs/reference/release-notes.asciidoc b/docs/reference/release-notes.asciidoc index 89c111ab6e..976bd6eafe 100644 --- a/docs/reference/release-notes.asciidoc +++ b/docs/reference/release-notes.asciidoc @@ -31,12 +31,9 @@ This section summarizes the changes in each release. * <<release-notes-5.0.0-alpha1-2x>> -- -<<<<<<< HEAD include::release-notes/5.4.1.asciidoc[] include::release-notes/5.4.0.asciidoc[] -======= include::release-notes/5.3.3.asciidoc[] ->>>>>>> cda04b4382... Added release notes for 5.3.3 include::release-notes/5.3.2.asciidoc[] include::release-notes/5.3.1.asciidoc[] include::release-notes/5.3.0.asciidoc[] |