Projects >> nuxeo-dam >>8cdf598675d8c581344ca45c5f64397256eaebfc

Chunk
Conflicting content
    // TODO: move this API to documentsListsManager directly
    /**
     * Tests whether the current working list of selected documents is empty.
<<<<<<< HEAD
     *
     * @param String listName The name of the working list of selected documents.
     *            If null, the default list will be used.
=======
     * 
     * @param String listName The name of the working list of selected
     *            documents. If null, the default list will be used.
>>>>>>> 4b42abca122812c5ce822fdba7f1a1ac05075d0f
     * @return boolean true if empty, false otherwise
     */
    public boolean getIsCurrentWorkingListEmpty(String listName) {
Solution content
    // TODO: move this API to documentsListsManager directly
    /**
     * Tests whether the current working list of selected documents is empty.
     * 
     * @param String listName The name of the working list of selected
     *            documents. If null, the default list will be used.
     * @return boolean true if empty, false otherwise
     */
    public boolean getIsCurrentWorkingListEmpty(String listName) {
File
BulkSelectActions.java
Developer's decision
Version 2
Kind of conflict
Comment