[Stack-cvs] stack-1-0/scripts stackXML.php,1.14,1.15

[pkiddie <pk...@us...>]

Update of /cvsroot/stack/stack-1-0/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24168/scripts

Modified Files:
	stackXML.php 
Log Message:
Resolve conflicts

Index: stackXML.php
===================================================================
RCS file: /cvsroot/stack/stack-1-0/scripts/stackXML.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** stackXML.php	25 Aug 2005 16:06:17 -0000	1.14
--- stackXML.php	25 Aug 2005 16:25:41 -0000	1.15
***************
*** 1652,1655 ****
--- 1652,1656 ----
      foreach($stackOptions as $arrayKey=>$optionField)
      {    
+ 	    show_array($optionField);
  	    if (!empty($optionField['type']))
  	    {