mirror of
https://github.com/freedombox/FreedomBox.git
synced 2026-08-19 12:36:06 +00:00
resolve conflict
This commit is contained in:
parent
f80e30342d
commit
6ab09922a3
@ -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):
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user