loleaflet/src/control/Control.Menubar.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 7b7cec7b356c8c901a23525b131273b185d62440
Author: Miklos Vajna <vmik...@collabora.com>
AuthorDate: Thu Jan 2 14:45:09 2020 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Jan 2 14:46:00 2020 +0100
loleaflet: fix syntax error caused by mismerge
loleaflet/src/control/Control.Menubar.js
286:5 error Parsing error: Unexpected token {
Change-Id: Ic14322210ec1e681f467536fcb91067d2aaeeea9
diff --git a/loleaflet/src/control/Control.Menubar.js
b/loleaflet/src/control/Control.Menubar.js
index 946f0507c..1e6ea6f7c 100644
--- a/loleaflet/src/control/Control.Menubar.js
+++ b/loleaflet/src/control/Control.Menubar.js
@@ -282,9 +282,9 @@ L.Control.Menubar = L.Control.extend({
{uno: '.uno:ModifyPage'},
{uno: '.uno:SlideChangeWindow'},
{uno: '.uno:CustomAnimation'},
- {uno: '.uno:MasterSlidesPanel'}]
+ {uno: '.uno:MasterSlidesPanel'},
{type: 'separator'},
- {uno: '.uno:Sidebar'},
+ {uno: '.uno:Sidebar'}]
},
{name: _UNO('.uno:InsertMenu', 'presentation'), id:
'insert', type: 'menu', menu: [
{name: _('Local Image...'), id:
'insertgraphic', type: 'action'},
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
