diff options
| author | fukachan <fukachan> | 2004-03-17 08:38:31 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2004-03-17 08:38:31 +0000 |
| commit | 09f74b5f49ac2d8248f798638d7ec6bf47bc0a13 (patch) | |
| tree | 9ec00485f9ae341669ba332e3f0f34d52af4a310 | |
| parent | 34b986d7458c0ef11a2a2da4e55b6f1584da93b3 (diff) | |
| download | fml8-09f74b5f49ac2d8248f798638d7ec6bf47bc0a13.tar.gz fml8-09f74b5f49ac2d8248f798638d7ec6bf47bc0a13.tar.bz2 fml8-09f74b5f49ac2d8248f798638d7ec6bf47bc0a13.zip | |
modify message
| -rw-r--r-- | fml/lib/FML/Merge.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fml/lib/FML/Merge.pm b/fml/lib/FML/Merge.pm index 2c63e38b..53bf28cb 100644 --- a/fml/lib/FML/Merge.pm +++ b/fml/lib/FML/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.3 2004/03/17 04:30:19 fukachan Exp $ +# $FML: Merge.pm,v 1.4 2004/03/17 06:08:23 fukachan Exp $ # package FML::Merge; @@ -277,7 +277,7 @@ sub _inject_diff_into_config_cf my ($k, $v, $x); print $wh "\n"; - print $wh "# START OF MERGE\n"; + print $wh "# BEGIN OF CONFIG CONVERSION\n"; print $wh "\n"; use FML::Merge::FML4::config_ph; @@ -291,7 +291,7 @@ sub _inject_diff_into_config_cf } print $wh "\n"; - print $wh "# END OF MERGE\n"; + print $wh "# END OF CONFIG CONVERSION\n"; print $wh "\n"; } |