artifact of resolving a minor merge conflict in SearchIncludeFragment…

….java (#7804)
IQSS · Nov 6, 2021 · 6ed3d69 · 6ed3d69
1 parent a2c0753
commit 6ed3d69
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java b/src/main/java/edu/harvard/iq/dataverse/search/SearchIncludeFragment.java
@@ -23,13 +23,7 @@
 import edu.harvard.iq.dataverse.WidgetWrapper;
 import edu.harvard.iq.dataverse.engine.command.DataverseRequest;
 import edu.harvard.iq.dataverse.util.BundleUtil;
-<<<<<<< HEAD
-import edu.harvard.iq.dataverse.util.FileUtil;
-=======
-import edu.harvard.iq.dataverse.util.SystemConfig;
-
 import java.time.LocalDate;
->>>>>>> develop
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;