commit c5f2f2a413e414e59d48f685e5db336c086f3fad
author rgoers <ralph.goers@dslextreme.com> Sun Feb 03 11:54:53 2019 -0700
committer rgoers <ralph.goers@dslextreme.com> Sun Feb 03 11:54:53 2019 -0700
tree 2391062ba38478be33f78a2022c83796760e51ca
parent 29b6a15714cbb9d1053b622eb81d0c311bc8ef1d
parent 60b275d3d07b1a73a1bd639e49c64f670aec8895

Resolve merge conflict

src/changes/changes.xml

diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 810f56b..ab5b5d1 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -30,7 +30,11 @@
          - "update" - Change
          - "remove" - Removed
     -->
+<<<<<<< HEAD
     <release version="2.11.2" date="2019-02-03" description="GA Release 2.11.2">
+      <action issue="LOG4J2-2500" dev="rgoers" type="fix">
+        Document that Properties element must be the first configuration element.
+      </action>
       <action issue="LOG4J2-2543" dev="rgoers" type="fix" due-to="Dermot Hardy">
         Add Log4j-to-SLF4J to BOM pom.xml.
       </action>