Resolve conflicts

JabRef · Jul 21, 2016 · ee8f0a0 · ee8f0a0
1 parent 5348396
commit ee8f0a0
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/src/test/java/net/sf/jabref/logic/util/io/UtilFindFileTest.java b/src/test/java/net/sf/jabref/logic/util/io/UtilFindFileTest.java
@@ -10,7 +10,6 @@
 import java.util.Set;
 
 import net.sf.jabref.FileBasedTestCase;
-import net.sf.jabref.Globals;
 import net.sf.jabref.model.entry.BibEntry;
 import net.sf.jabref.support.DevEnvironment;
 
@@ -35,7 +34,7 @@ public void testFindAssociatedFiles() {
         Collection<File> dirs = Arrays.asList(rootDir.resolve("graphicsDir").toFile(),
                 rootDir.resolve("pdfs").toFile());
 
-        Map<BibEntry, List<File>> results = FileUtil.findAssociatedFiles(entries, extensions, dirs, Globals.prefs);
+        Map<BibEntry, List<File>> results = FileUtil.findAssociatedFiles(entries, extensions, dirs);
 
         assertEquals(2, results.get(entry).size());
         assertTrue(results.get(entry)