From b1ce70434e366b30c6632905a1afd84099e01a13 Mon Sep 17 00:00:00 2001
From: reger <reger18@arcor.de>
Date: Sun, 27 Oct 2013 15:24:04 +0100
Subject: [PATCH] resolve merge conflict - add missing import statement

---
 source/net/yacy/yacy.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/source/net/yacy/yacy.java b/source/net/yacy/yacy.java
index 1cf3008ad..e9f7adde2 100644
--- 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;
 
 
 /**