Permalink
Browse files

merge collection page conflict

  • Loading branch information...
1 parent b8a4650 commit e4d3410a750ed2735d07e5405cd93c5af7a3b18b Juan Pinzon committed with Charles Jolley Jun 30, 2009
Showing with 2 additions and 1 deletion.
  1. +2 −1 apps/sample_controls/english.lproj/controls_page.js
@@ -478,7 +478,8 @@ SampleControls.controlsPage = SC.Page.create({
isEditable: YES
}, {
value: "Editable icon",
- isEditable: YES
+ isEditable: YES,
+ icon: "sc-icon-help-16"
})
.title('SC.DisclosureView').height(18).sample(SC.DisclosureView, {

0 comments on commit e4d3410

Please sign in to comment.