From 172d6594c7e58d13791a5f4310b2398781cde9ae Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Fri, 11 Aug 2017 00:24:24 -0400 Subject: [PATCH] Fix version 2.5.1 release notes typo. Signed-off-by: Roberto Rosario --- docs/releases/2.5.1.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/releases/2.5.1.rst b/docs/releases/2.5.1.rst index 5686968390..0b1af58a4d 100644 --- a/docs/releases/2.5.1.rst +++ b/docs/releases/2.5.1.rst @@ -63,12 +63,9 @@ Backward incompatible changes Bugs fixed or issues closed =========================== -<<<<<<< HEAD:docs/releases/2.5.1.rst * None ======= * `GitLab issue #378 `_ Add metadata widget changes from @Macrobb * `GitLab issue #379 `_ Add new document version list view permission. ->>>>>>> 105eab074... Add new document version list view permission. GitLab issue #379:docs/releases/3.0.rst - .. _PyPI: https://pypi.python.org/pypi/mayan-edms/