Author: nbelaevski Date: 2008-10-21 11:43:06 -0400 (Tue, 21 Oct 2008) New Revision: 10855 Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data-dnd.properties Log: https://jira.jboss.org/jira/browse/RF-4452 Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data-dnd.properties =================================================================== --- trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data-dnd.properties 2008-10-21 15:22:10 UTC (rev 10854) +++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/tree/examples/simple-tree-data-dnd.properties 2008-10-21 15:43:06 UTC (rev 10855) @@ -8,9 +8,6 @@ 1.6=pic6.jpg - leaf 1.7=pic7.jpg - leaf 1.8=pic8.jpg - leaf -<<<<<<< .mine 1.9=pic9.jpg - leaf -2 = Favorites - node -3 = Trash - node======= 2=Favorites - node - favorites.gif -3=Trash - node - trash_full.gif - trash.gif >>>>>>> .r10385 +3=Trash - node - trash_full.gif - trash.gif \ No newline at end of file