From e5f3976b89a8b3c581ad472bb036a02b9b4f9ec1 Mon Sep 17 00:00:00 2001
From: hsoft <none@none>
Date: Mon, 28 Sep 2009 16:24:03 +0000
Subject: [PATCH] dgse cocoa: adjusted to the latest developments.

--HG--
extra : convert_revision : svn%3Ac306627e-7827-47d3-bdf0-9a457c9553a1/trunk%40155
---
 se/cocoa/py/dg_cocoa.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/se/cocoa/py/dg_cocoa.py b/se/cocoa/py/dg_cocoa.py
index 1dffaa32..93eded52 100644
--- a/se/cocoa/py/dg_cocoa.py
+++ b/se/cocoa/py/dg_cocoa.py
@@ -12,8 +12,9 @@ from dupeguru import app_se_cocoa, scanner
 
 # Fix py2app imports with chokes on relative imports
 from dupeguru import app, app_cocoa, data, directories, engine, export, ignore, results, scanner
-from hsfs import auto, manual, stats, tree, utils
+from hsfs import auto, stats, tree
 from hsfs.phys import bundle
+from hsutil import conflict
 
 class PyApp(NSObject):
     pass #fake class