Projects >> nuxeo-core >>10cc4313451a1fffb0042d38574a564d4f2b5469

Chunk
Conflicting content
<<<<<<< HEAD:nuxeo-core-management-test/src/main/java/org/nuxeo/ecm/core/management/test/FakeDocumentStoreHandler.java
package org.nuxeo.ecm.core.management.test;
=======
/*
 * (C) Copyright 2010 Nuxeo SAS (http://nuxeo.com/) and contributors.
 *
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the GNU Lesser General Public License
 * (LGPL) version 2.1 which accompanies this distribution, and is available at
 * http://www.gnu.org/licenses/lgpl.html
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * Lesser General Public License for more details.
 *
 * Contributors:
 *     Nuxeo - initial API and implementation
 */

package org.nuxeo.ecm.core.management.test.storage;
>>>>>>> 90d9404844c033e918444abcff9592c9fd8eab32:nuxeo-core-management-test/src/test/java/org/nuxeo/ecm/core/management/test/storage/FakeDocumentStoreHandler.java

import org.nuxeo.ecm.core.api.CoreSession;
import org.nuxeo.ecm.core.management.storage.DocumentStoreHandler;
Solution content
/*
 * (C) Copyright 2010 Nuxeo SAS (http://nuxeo.com/) and contributors.
 *
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the GNU Lesser General Public License
 * (LGPL) version 2.1 which accompanies this distribution, and is available at
 * http://www.gnu.org/licenses/lgpl.html
 *
 * This library is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
 * Lesser General Public License for more details.
 *
 * Contributors:
 *     Nuxeo - initial API and implementation
 */

package org.nuxeo.ecm.core.management.test;

import org.nuxeo.ecm.core.api.CoreSession;
import org.nuxeo.ecm.core.management.storage.DocumentStoreHandler;
File
FakeDocumentStoreHandler.java
Developer's decision
Combination
Kind of conflict
Comment
Package declaration