Skip to content

V
vmj-qt
Commit 8b6bfeda authored by Dan Pascu's avatar Dan Pascu
Browse files
Options

Fixed conflict

parent e2de802d
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
blink/configuration/account.py
View file @ 8b6bfeda
...@@ -34,7 +34,8 @@ class TLSSettingsExtension(TLSSettings): ...@@ -34,7 +34,8 @@ class TLSSettingsExtension(TLSSettings):
class AccountExtension(SettingsObjectExtension): class AccountExtension(SettingsObjectExtension):
pstn = PSTNSettingsExtension display_name = Setting(type=str, default=user_info.fullname, nillable=True)
pstn = PSTNSettings
rtp = RTPSettingsExtension rtp = RTPSettingsExtension
server = ServerSettings server = ServerSettings
sounds = SoundSettings sounds = SoundSettings
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023