diff options
| author | segfault <segfault@riseup.net> | 2016-08-19 15:01:10 +0000 |
|---|---|---|
| committer | segfault <segfault@riseup.net> | 2016-08-19 15:01:10 +0000 |
| commit | 3098d037985abd6bddaf7e712892c65c4962f31e (patch) | |
| tree | ea08be5096014ea807c13964ccd1721c2bff43d6 | |
| parent | 62d939d33b7f73b88a407d0bcdef2b525e0b7dfa (diff) | |
| parent | 0683b13dd1097634564db04b74770168b2fdba5e (diff) | |
Merge /home/amnesia/Persistent/tails into feature/5688-tails-server_user-pretestfeature/5688-tails-server_user-test
Conflicts:
config/chroot_local-includes/usr/lib/python3.4/dist-packages/tails_server/gui/config_panel.py
| -rw-r--r-- | config/chroot_local-includes/usr/lib/python3.4/dist-packages/tails_server/gui/config_panel.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/config/chroot_local-includes/usr/lib/python3.4/dist-packages/tails_server/gui/config_panel.py b/config/chroot_local-includes/usr/lib/python3.4/dist-packages/tails_server/gui/config_panel.py index 67a4017..ddde8d2 100644 --- a/config/chroot_local-includes/usr/lib/python3.4/dist-packages/tails_server/gui/config_panel.py +++ b/config/chroot_local-includes/usr/lib/python3.4/dist-packages/tails_server/gui/config_panel.py @@ -186,8 +186,6 @@ class ServiceConfigPanel(object): label = self.builder.get_object("label_persistence_comment") if label in persistence_row.box.get_children(): persistence_row.box.remove(label) - return - def update_autorun_checkbox(self): try: @@ -409,4 +407,4 @@ class ServiceConfigPanel(object): self.show() def on_button_help_clicked(self, button): - sh.sudo("-u", "amnesia", "xdg-open", self.service.documentation) + sh.sudo("-u", "amnesia", "xdg-open", self.service.documentation)
\ No newline at end of file |