Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove conflict markers

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@112153 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rginda%netscape.com 2002-01-15 03:16:48 +00:00
parent d2bc486a83
commit cd42033d11
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/extensions/irc/xul/content/static.js
View File

@ -1663,18 +1663,9 @@ function setCurrentObject (obj)
/* Unselect currently selected users. */
userList = document.getElementById("user-list");
<<<<<<< static.js
if (userList)
/* Remove curently selection items before this tree gets rerooted,
* because it seems to remember the selections for eternity if not. */
userList.clearSelection ();
else
dd ("setCurrentObject: could not find element with ID='user-list'");
=======
/* Remove curently selection items before this tree gets rerooted,
* because it seems to remember the selections for eternity if not. */
userList.clearItemSelection ();
>>>>>>> 1.31
userList.clearSelection ();
if (obj.TYPE == "IRCChannel")
client.rdf.setTreeRoot ("user-list", obj.getGraphResource());