Skip to content
Browse files

Follows changes in kernel

  • Loading branch information...
1 parent fd051fa commit f41e57c015166d1f9fa9d69c717a1cd60ac86d44 @tinwelint committed Apr 17, 2012
Showing with 5 additions and 8 deletions.
  1. +5 −8 backup/src/test/java/org/neo4j/backup/TestBackup.java
View
13 backup/src/test/java/org/neo4j/backup/TestBackup.java
@@ -20,8 +20,13 @@
package org.neo4j.backup;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.fail;
+
import java.io.File;
import java.io.FilenameFilter;
+
import org.apache.commons.io.FileUtils;
import org.junit.Before;
import org.junit.Test;
@@ -34,12 +39,6 @@
import org.neo4j.graphdb.factory.GraphDatabaseSetting;
import org.neo4j.graphdb.factory.GraphDatabaseSettings;
import org.neo4j.graphdb.index.Index;
-<<<<<<< HEAD
-import org.neo4j.helpers.collection.MapUtil;
-import org.neo4j.kernel.Config;
-=======
-import org.neo4j.kernel.AbstractGraphDatabase;
->>>>>>> master
import org.neo4j.kernel.EmbeddedGraphDatabase;
import org.neo4j.kernel.GraphDatabaseAPI;
import org.neo4j.kernel.impl.transaction.xaframework.XaDataSource;
@@ -48,8 +47,6 @@
import org.neo4j.test.TargetDirectory;
import org.neo4j.test.subprocess.SubProcess;
-import static org.junit.Assert.*;
-
public class TestBackup
{
private final String serverPath = "target/var/serverdb";

0 comments on commit f41e57c

Please sign in to comment.
Something went wrong with that request. Please try again.