Skip to content

Commit

Permalink
fix a merge error
Browse files Browse the repository at this point in the history
  • Loading branch information
Lei Gao committed Jun 27, 2012
1 parent dbc2f54 commit ba4127c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/java/voldemort/client/DefaultStoreClient.java
Expand Up @@ -32,10 +32,10 @@
import voldemort.cluster.Node;
import voldemort.routing.RoutingStrategy;
import voldemort.serialization.Serializer;
import voldemort.server.SystemStoreConstants;
import voldemort.store.InvalidMetadataException;
import voldemort.store.Store;
import voldemort.store.StoreCapabilityType;
import voldemort.store.system.SystemStoreConstants;
import voldemort.utils.JmxUtils;
import voldemort.utils.ManifestFileReader;
import voldemort.utils.Utils;
Expand Down

0 comments on commit ba4127c

Please sign in to comment.