[meld] tree: Reorder constant declarations so that imports are grouped

[Kai Willadsen <kaiw src gnome org>]

commit b82fae46280c357d72057d0b16bf035fde3d7500
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Sun Dec 17 06:54:49 2017 +1000

    tree: Reorder constant declarations so that imports are grouped

 meld/tree.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/meld/tree.py b/meld/tree.py
index 4d0d67ed..bb0345a9 100644
--- a/meld/tree.py
+++ b/meld/tree.py
@@ -20,12 +20,6 @@ from gi.repository import Gdk
 from gi.repository import Gtk
 from gi.repository import Pango
 
-COL_PATH, COL_STATE, COL_TEXT, COL_ICON, COL_TINT, COL_FG, COL_STYLE, \
-    COL_WEIGHT, COL_STRIKE, COL_END = list(range(10))
-
-COL_TYPES = (str, str, str, str, str, Gdk.RGBA, Pango.Style,
-             Pango.Weight, bool)
-
 from meld.misc import colour_lookup_with_fallback
 from meld.treehelpers import SearchableTreeStore
 from meld.vc._vc import \
@@ -36,6 +30,12 @@ from meld.vc._vc import \
     CONFLICT_BASE, CONFLICT_LOCAL, CONFLICT_REMOTE, \
     CONFLICT_MERGED, CONFLICT_OTHER, CONFLICT_THIS
 
+COL_PATH, COL_STATE, COL_TEXT, COL_ICON, COL_TINT, COL_FG, COL_STYLE, \
+    COL_WEIGHT, COL_STRIKE, COL_END = list(range(10))
+
+COL_TYPES = (str, str, str, str, str, Gdk.RGBA, Pango.Style,
+             Pango.Weight, bool)
+
 
 class DiffTreeStore(SearchableTreeStore):