fix merge conflicts

2016-01-19 14:49:42 -05:00
parent bcfee41a57
commit d33230d361
97 changed files with 1205 additions and 811 deletions
@@ -1159,7 +1159,7 @@
                                performAdvancedRefresh(page);
                                break;
                            case 'delete':
-                                LibraryBrowser.deleteItem(currentItem.Id);
+                                LibraryBrowser.deleteItems([currentItem.Id]);
                                break;
                            case 'editimages':
                                LibraryBrowser.editImages(currentItem.Id);