commit b52601262b1747c3c00062438a16c210471fb05d
author Jukka Zitting <jukka@apache.org> Wed Nov 29 10:02:08 2006 +0000
committer Jukka Zitting <jukka@apache.org> Wed Nov 29 10:02:08 2006 +0000
tree ec74a0a6560f526080d276e5cbeae4f07ce15057
parent 36ccfa6d5fb9ec9f16339a22f3ba7073e0297cd6

branches/1.1: Fixed a merge error

git-svn-id: https://svn.apache.org/repos/asf/jackrabbit/branches/1.1@480505 13f79535-47bb-0310-9956-ffa450edef68

jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java

diff --git a/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java b/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
index 965ef31..c01e26c 100644
--- a/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
+++ b/jackrabbit/src/main/java/org/apache/jackrabbit/core/state/SharedItemStateManager.java
@@ -22,7 +22,7 @@
 import org.apache.jackrabbit.core.NodeId;
 import org.apache.jackrabbit.core.PropertyId;
 import org.apache.jackrabbit.core.RepositoryImpl;
-import org.apache.jackrabbit.core.persistence.PersistenceManager;
+import org.apache.jackrabbit.core.state.PersistenceManager;
 import org.apache.jackrabbit.core.version.XAVersionManager;
 import org.apache.jackrabbit.core.nodetype.EffectiveNodeType;
 import org.apache.jackrabbit.core.nodetype.NodeDefId;