diff options
| author | Michael DeHaan <mdehaan@redhat.com> | 2007-10-23 17:45:06 -0400 |
|---|---|---|
| committer | Michael DeHaan <mdehaan@redhat.com> | 2007-10-23 17:45:06 -0400 |
| commit | 6b4728448125f5f9953371444d873c426b3bb5d0 (patch) | |
| tree | 2b5e6c73bad5fc0d059b79d0cd470da5e216b113 /func | |
| parent | bc877bb8fc139429d18defebfc168c665ae7ff10 (diff) | |
| parent | 4404e59a62a4108a644ad84993e6cc69c7e2dfb2 (diff) | |
| download | third_party-func-6b4728448125f5f9953371444d873c426b3bb5d0.tar.gz third_party-func-6b4728448125f5f9953371444d873c426b3bb5d0.tar.xz third_party-func-6b4728448125f5f9953371444d873c426b3bb5d0.zip | |
Merge branch 'master' of ssh://git.fedoraproject.org/git/hosted/func
Conflicts:
func/overlord/client.py
Diffstat (limited to 'func')
| -rwxr-xr-x | func/overlord/client.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/func/overlord/client.py b/func/overlord/client.py index 3da1251..f517117 100755 --- a/func/overlord/client.py +++ b/func/overlord/client.py @@ -26,7 +26,6 @@ from func.config import read_config, CONFIG_FILE import sslclient import command -# import func_command # =================================== # defaults |