[meld] tree: noqa our state imports; other modules import these from tree

[Kai Willadsen <kaiw src gnome org>]

commit bcf31b98d68fc7cd35336a50bd1d75e38e6db7fa
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sat Dec 23 13:25:52 2017 +1000

    tree: noqa our state imports; other modules import these from tree
    
    This situation isn't ideal, but reworking other things to pull their
    state constants from elsewhere is way too much work now. We should make
    these a real enum at some point instead.

 meld/tree.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/meld/tree.py b/meld/tree.py
index 0b1c34f8..5ec56ba0 100644
--- a/meld/tree.py
+++ b/meld/tree.py
@@ -23,7 +23,7 @@ from gi.repository import Pango
 
 from meld.misc import colour_lookup_with_fallback
 from meld.treehelpers import SearchableTreeStore
-from meld.vc._vc import (
+from meld.vc._vc import (  # noqa: F401
     CONFLICT_BASE, CONFLICT_LOCAL, CONFLICT_MERGED, CONFLICT_OTHER,
     CONFLICT_REMOTE, CONFLICT_THIS, STATE_CONFLICT, STATE_EMPTY, STATE_ERROR,
     STATE_IGNORED, STATE_MAX, STATE_MISSING, STATE_MODIFIED, STATE_NEW,