taylor      2004/08/02 14:02:24

  Modified:    fusion/src/webapp/WEB-INF/psml/user/admin/html default.psml
  Log:
  conflicting ids
  
  CVS: ----------------------------------------------------------------------
  CVS: PR:
  CVS:   If this change addresses a PR in the problem report tracking
  CVS:   database, then enter the PR number(s) here.
  CVS: Obtained from:
  CVS:   If this change has been taken from another system, such as NCSA,
  CVS:   then name the system in this line, otherwise delete it.
  CVS: Submitted by:
  CVS:   If this code has been contributed to Apache by someone else; i.e.,
  CVS:   they sent us a patch or a new module, then include their name/email
  CVS:   address here. If this is your work then delete this line.
  CVS: Reviewed by:
  CVS:   If we are doing pre-commit code reviews and someone else has
  CVS:   reviewed your changes, include their name(s) here.
  CVS:   If you have not had it reviewed then delete this line.
  
  Revision  Changes    Path
  1.2       +2 -2      
jakarta-jetspeed/fusion/src/webapp/WEB-INF/psml/user/admin/html/default.psml
  
  Index: default.psml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jetspeed/fusion/src/webapp/WEB-INF/psml/user/admin/html/default.psml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- default.psml      2 Aug 2004 19:30:26 -0000       1.1
  +++ default.psml      2 Aug 2004 21:02:23 -0000       1.2
  @@ -44,7 +44,7 @@
           <entry id='325' parent="PermissionBrowser"/>
           <entry id='326' parent="GroupBrowser"/>
           <entry id="345" parent="SecurityBrowser"/>
  -        <entry id="346" parent="PABrowser"/>
  +        <entry id="399" parent="PABrowser"/>
           <entry id='327' parent="UserForm">
               <parameter name="_menustate" value="closed"/>
           </entry>
  @@ -72,7 +72,7 @@
           <entry id="350" parent="SecurityForm">
               <parameter name="_menustate" value="closed"/>
           </entry>
  -        <entry id="352" parent="PAForm">
  +        <entry id="398" parent="PAForm">
               <parameter name="_menustate" value="closed"/>
           </entry>
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to