style + merge fix

This commit is contained in:
Matthias 2021-05-26 13:18:07 +02:00
parent 859a3178a4
commit 9d5b90190b
2 changed files with 3 additions and 2 deletions

View File

@ -5,11 +5,12 @@ Django forms for interacting with common objects
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from decimal import Decimal, InvalidOperation
from django import forms
from django.utils.translation import gettext as _
from InvenTree.forms import HelperForm
from InvenTree.helpers import clean_decimal
from .files import FileManager
from .models import InvenTreeSetting