resolve merge conflict

- add missing import statement
11 years ago · b1ce70434e
parent 7869a4c070
commit b1ce70434e
1 changed files with 3 additions and 0 deletions
--- a/source/net/yacy/yacy.java
+++ b/source/net/yacy/yacy.java
@ -67,6 +67,9 @@ import net.yacy.server.serverCore;
 import net.yacy.server.http.HTTPDemon;

 import com.google.common.io.Files;
+import net.yacy.cora.document.id.DigestURL;
+import net.yacy.cora.federate.yacy.CacheStrategy;
+import net.yacy.crawler.retrieval.Response;


 /**