Fixed conflict

8b6bfeda · Dan Pascu · e2de802d · 8b6bfeda
Commit 8b6bfeda authored Sep 17, 2010 by Dan Pascu
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

account.py blink/configuration/account.py +2 -1

No files found.
--- a/blink/configuration/account.py
+++ b/blink/configuration/account.py
@@ -34,7 +34,8 @@ class TLSSettingsExtension(TLSSettings):


 class AccountExtension(SettingsObjectExtension):
-    pstn = PSTNSettingsExtension
+    display_name = Setting(type=str, default=user_info.fullname, nillable=True)
+    pstn = PSTNSettings
    rtp = RTPSettingsExtension
    server = ServerSettings
    sounds = SoundSettings