[mjr] Fix ActiveSync SmartForward handling.

horde · Aug 27, 2020 · 34de9a6 · 34de9a6
1 parent e5839ed
commit 34de9a6
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/doc/Horde/Core/changelog.yml b/doc/Horde/Core/changelog.yml
@@ -8,18 +8,19 @@
   license:
     identifier: LGPL-2.1
     uri: http://www.horde.org/licenses/lgpl21
-  notes: |+
-
+  notes: |
+    [mjr] Fix ActiveSync SmartForward handling.
+    |+
 2.31.14:
   api: 2.31.0
   state:
     release: stable
     api: stable
-<<<<<<< HEAD
+0:
   date: 2020-06-08
-=======
+1:
   date: 2020-02-24
->>>>>>> Update date
+2:
   license:
     identifier: LGPL-2.1
     uri: http://www.horde.org/licenses/lgpl21