diff options
| author | fukachan <fukachan> | 2004-03-17 06:06:42 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2004-03-17 06:06:42 +0000 |
| commit | 6a55ce2c8a9338d2f863731d8a90760f091a483c (patch) | |
| tree | 57e4b70c389f836c8be840ec6a530952d54798f1 | |
| parent | 78448ce19658306f853d5ba80a0dcd516357e074 (diff) | |
| download | fml8-6a55ce2c8a9338d2f863731d8a90760f091a483c.tar.gz fml8-6a55ce2c8a9338d2f863731d8a90760f091a483c.tar.bz2 fml8-6a55ce2c8a9338d2f863731d8a90760f091a483c.zip | |
enable config.cf translator
| -rw-r--r-- | fml/lib/FML/Command/Admin/merge.pm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/fml/lib/FML/Command/Admin/merge.pm b/fml/lib/FML/Command/Admin/merge.pm index fb8baeaf..81fa49f2 100644 --- a/fml/lib/FML/Command/Admin/merge.pm +++ b/fml/lib/FML/Command/Admin/merge.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: merge.pm,v 1.1 2004/03/16 13:07:33 fukachan Exp $ +# $FML: merge.pm,v 1.2 2004/03/17 04:09:37 fukachan Exp $ # package FML::Command::Admin::merge; @@ -14,7 +14,7 @@ use Carp; =head1 NAME -FML::Command::Admin::merge - what is this +FML::Command::Admin::merge - top level dispather of configuration merge =head1 SYNOPSIS @@ -120,8 +120,6 @@ sub process # 4. convert files if needed. $merge->convert_list_files(); - return; - # 5. analyze fml4 configuration and build diff only. # 6. translate diff into fml8 cf. $merge->merge_into_config_cf(); |