From 6ab09922a328e66c96ad389383fd19d431ef5425 Mon Sep 17 00:00:00 2001 From: James Vasile Date: Sat, 9 Feb 2013 13:33:12 -0500 Subject: [PATCH] resolve conflict --- modules/installed/first_boot.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/installed/first_boot.py b/modules/installed/first_boot.py index 8706689fa..af6261263 100644 --- a/modules/installed/first_boot.py +++ b/modules/installed/first_boot.py @@ -4,7 +4,8 @@ from gettext import gettext as _ from plugin_mount import PagePlugin, PluginMount, FormPlugin from modules.auth import require from forms import Form -from util import * +import util as u +from vendor.withsqlite.withsqlite import sqlite_db import cfg class FirstBoot(PagePlugin):