[pLog-svn] r5782 - plog/trunk/templates/admin/chooser

[oscar at devel.lifetype.net]

Author: oscar
Date: 2007-08-03 18:07:19 -0400 (Fri, 03 Aug 2007)
New Revision: 5782

Modified:
   plog/trunk/templates/admin/chooser/siteuserschooser.template
Log:
Removed some stuff from a badly resolved conflict.


Modified: plog/trunk/templates/admin/chooser/siteuserschooser.template
===================================================================
--- plog/trunk/templates/admin/chooser/siteuserschooser.template	2007-08-03 22:04:32 UTC (rev 5781)
+++ plog/trunk/templates/admin/chooser/siteuserschooser.template	2007-08-03 22:07:19 UTC (rev 5782)
@@ -66,11 +66,7 @@
 						    {if $mode=="1"}
                               <a href="javascript:setDocumentField(parent.opener.document, 'userName','{$siteuser->getUsername()}');setDocumentField(parent.opener.document,'userId','{$siteuser->getId()}');window.close()">
 							{else}
-<<<<<<< .working
-							  <a href="javascript:appendDocumentList(parent.opener.document, 'userList','{$siteuser->getId()}','{$siteuser->getUsername()}');window.close()">
-=======
 							  <a href="javascript:Lifetype.Forms.List.appendToExternalList(top.document, 'userList','{$siteuser->getId()}','{$siteuser->getUsername()}');window.close()">
->>>>>>> .merge-right.r5682
 							{/if}
 							  {$siteuser->getUsername()}
 							</a>