From bb2dab505fa0d18a6652cb33e101791be60eaa58 Mon Sep 17 00:00:00 2001
From: hsoft <none@none>
Date: Mon, 28 Sep 2009 16:08:09 +0000
Subject: [PATCH] dgme cocoa: adjusted to the latest developments.

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

diff --git a/me/cocoa/py/dg_cocoa.py b/me/cocoa/py/dg_cocoa.py
index 613f9044..87c723c0 100644
--- a/me/cocoa/py/dg_cocoa.py
+++ b/me/cocoa/py/dg_cocoa.py
@@ -12,9 +12,10 @@ from dupeguru import app_me_cocoa, scanner
 
 # Fix py2app imports which 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, music
+from hsfs import auto, stats, tree, music
 from hsfs.phys import music
 from hsmedia import aiff, flac, genres, id3v1, id3v2, mp4, mpeg, ogg, wma
+from hsutil import conflict
 
 class PyApp(NSObject):
     pass #fake class