From 97663028691e3e6b7365a49d479a6170c47add27 Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Wed, 15 Apr 2020 12:53:44 +1200 Subject: [PATCH] DOC Fix broken merge request in change logs --- docs/en/04_Changelogs/4.4.6.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/en/04_Changelogs/4.4.6.md b/docs/en/04_Changelogs/4.4.6.md index a64dec674..bae0b6f8b 100644 --- a/docs/en/04_Changelogs/4.4.6.md +++ b/docs/en/04_Changelogs/4.4.6.md @@ -445,7 +445,6 @@ for more details. -<<<<<<< HEAD ## Change Log ### Bugfixes @@ -453,6 +452,4 @@ for more details. * 2020-03-09 [6779fd3](https://github.com/silverstripe/silverstripe-assets/commit/6779fd3c8c1c05a3db5035bf6e541c9483d161fc) Add FolderMigrationHelper * 2020-03-08 [b269d8749](https://github.com/silverstripe/silverstripe-framework/commit/b269d874909cd70bb60c1a2974ea5446b43b0436) Register new sub tasks to fix files affected by CVE-2020-9280 and CVE-2019-12245 (Serge Latyntcev) * 2020-03-04 [12ea7cd](https://github.com/silverstripe/silverstripe-assets/commit/12ea7cd2037bebcb3196dd5e3aaa72e6dbc7c7b2) Create NormaliseAccessMigrationHelper to fix files affected by CVE-2019-12245 (Maxime Rainville) -======= ->>>>>>> 4.5.3