Fix merge conflicts

This commit is contained in:
Nick O'Leary
2017-01-05 10:07:23 +00:00
64 changed files with 7993 additions and 1140 deletions

View File

@@ -42,7 +42,7 @@ RED.sidebar.info = (function() {
content: content,
enableOnEdit: true
});
RED.actions.add("core:show-info-tab",show);
}
function show() {