diff options
author | makefu <root@pigstarter.de> | 2014-04-25 14:19:51 +0200 |
---|---|---|
committer | makefu <root@pigstarter.de> | 2014-04-25 14:22:28 +0200 |
commit | fe0a555e87f5e522e4d4e4a4f27a09c02e267590 (patch) | |
tree | 19c84c87642d519e135487515de1e4e914c5bfff /Reaktor/commands/caps | |
parent | 3560697a49050d74b04a537a994b34e1e4a4c807 (diff) | |
parent | 018441364e956c6128fe9e898f7176a324875ded (diff) |
Merge branch 'master' of https://github.com/krebscode/painload
Conflicts:
Reaktor/config.py
Diffstat (limited to 'Reaktor/commands/caps')
-rwxr-xr-x | Reaktor/commands/caps | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Reaktor/commands/caps b/Reaktor/commands/caps index d0245575..b5d6642d 100755 --- a/Reaktor/commands/caps +++ b/Reaktor/commands/caps @@ -10,4 +10,4 @@ def load_config(filename): config = load_config(os.environ['config_filename']) print('Private: '+' '.join(filter(None,[ x.get('capname',None) for x in config.commands]))) -print('Public: '+' '.join(filter(None,[ x.get('capname',None) for x in config.public_commands]))) +print('Public: '+' '.join(filter(None,[ x.get('capname',None) for x in config.public_commands]))) |