diff options
| -rw-r--r-- | cobbler.spec | 4 | ||||
| -rw-r--r-- | cobbler/webui/master.py | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/cobbler.spec b/cobbler.spec index 070bff3..ca6640f 100644 --- a/cobbler.spec +++ b/cobbler.spec @@ -191,15 +191,11 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT %changelog -<<<<<<< HEAD:cobbler.spec * Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.9.0-1 - Upstream changes (see CHANGELOG) - packaged /etc/cobbler/users.conf -* Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-1 -======= * Tue Apr 08 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.3-2 ->>>>>>> master:cobbler.spec - Upstream changes (see CHANGELOG) * Fri Mar 07 2008 Michael DeHaan <mdehaan@redhat.com> - 0.8.2-1 diff --git a/cobbler/webui/master.py b/cobbler/webui/master.py index 0a6e9dd..8f7de66 100644 --- a/cobbler/webui/master.py +++ b/cobbler/webui/master.py @@ -33,8 +33,8 @@ VFN=valueForName currentTime=time.time __CHEETAH_version__ = '2.0.1' __CHEETAH_versionTuple__ = (2, 0, 1, 'final', 0) -__CHEETAH_genTime__ = 1207681739.292002 -__CHEETAH_genTimestamp__ = 'Tue Apr 8 15:08:59 2008' +__CHEETAH_genTime__ = 1207686192.9310019 +__CHEETAH_genTimestamp__ = 'Tue Apr 8 16:23:12 2008' __CHEETAH_src__ = 'webui_templates/master.tmpl' __CHEETAH_srcLastModified__ = 'Fri Feb 15 14:47:43 2008' __CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine' |