From c6fe9362cd4d83fbe0f747367609051ab5828f59 Mon Sep 17 00:00:00 2001
From: Greg Sherwood <gsherwood@squiz.net>
Date: Mon, 9 Mar 2020 10:57:44 +1100
Subject: [PATCH] Changelog for #2878

---
 package.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.xml b/package.xml
index 78ecef0b60..1f2ced9b58 100644
--- a/package.xml
+++ b/package.xml
@@ -39,6 +39,7 @@ http://pear.php.net/dtd/package-2.0.xsd">
   - Fixed bug #2853 : Undefined variable error when using Info report
     -- Thanks to Juliette Reinders Folmer for the patch
   - Fixed bug #2868 : phpcs:ignore annotation doesnt work inside a docblock
+  - Fixed bug #2878 : PSR12.Files.FileHeader conflicts with Generic.Files.LineEndings
  </notes>
  <contents>
   <dir name="/">