diff options
author | Michael DeHaan <mdehaan@redhat.com> | 2008-05-28 11:07:39 -0400 |
---|---|---|
committer | Michael DeHaan <mdehaan@redhat.com> | 2008-05-28 11:07:39 -0400 |
commit | 36fd29894dc5859fa295aac08d2726cf77667088 (patch) | |
tree | 75ec187193a029af50a898878c9fe9f56735075b /cobbler/yaml/klass.py | |
parent | 60e7b2048cb810082d9f5da189d827d0dec3747c (diff) | |
parent | 2963016f5c143a6f3c3bc711a2b6d1ed07d65abe (diff) | |
download | third_party-cobbler-36fd29894dc5859fa295aac08d2726cf77667088.tar.gz third_party-cobbler-36fd29894dc5859fa295aac08d2726cf77667088.tar.xz third_party-cobbler-36fd29894dc5859fa295aac08d2726cf77667088.zip |
Merge branch 'devel'
Conflicts:
cobbler.spec
cobbler/item_system.py
cobbler/webui/master.py
Diffstat (limited to 'cobbler/yaml/klass.py')
-rw-r--r-- | cobbler/yaml/klass.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/cobbler/yaml/klass.py b/cobbler/yaml/klass.py index edcf5a8..c182fcf 100644 --- a/cobbler/yaml/klass.py +++ b/cobbler/yaml/klass.py @@ -1,3 +1,9 @@ +"""
+pyyaml legacy
+Copyright (c) 2001 Steve Howell and Friends; All Rights Reserved
+(see open source license information in docs/ directory)
+"""
+
import new
import re
|