[Openinteract-commits] CVS: OpenInteract2/doc/Manual Conversion.pod,1.12,1.13

[Chris W. <la...@us...>]

Update of /cvsroot/openinteract/OpenInteract2/doc/Manual
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30046

Modified Files:
	Conversion.pod 
Log Message:
resolve conflict

Index: Conversion.pod
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/doc/Manual/Conversion.pod,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Conversion.pod	28 Nov 2004 15:04:13 -0000	1.12
--- Conversion.pod	28 Nov 2004 16:19:25 -0000	1.13
***************
*** 172,178 ****
  C<OpenInteract2::Conversion>. They work on STDIN and STDOUT:
  
!   $ cd /path/to/OpenInteract-2.00-source/script
!   $ perl translate_action_to_ini.pl < ~/pkg/mypkg/conf/action.perl > action.ini
!   $ perl translate_spops_to_ini.pl < ~/pkg/mypkg/conf/spops.perl > spops.ini
  
  In addition to doing the fairly simple conversion from the Perl data
--- 172,178 ----
  C<OpenInteract2::Conversion>. They work on STDIN and STDOUT:
  
!  $ cd /path/to/OpenInteract-2.00-source/script
!  $ perl translate_action_to_ini.pl < ~/pkg/mypkg/conf/action.perl > action.ini
!  $ perl translate_spops_to_ini.pl < ~/pkg/mypkg/conf/spops.perl > spops.ini
  
  In addition to doing the fairly simple conversion from the Perl data