resolve conflict

This commit is contained in:
James Vasile 2013-02-09 13:33:12 -05:00
parent f80e30342d
commit 6ab09922a3

View File

@ -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):