diff options
| author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
| commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
| tree | c702d67585f72cddf55932411e7100133bc58452 /js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html | |
| parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html')
| -rwxr-xr-x | js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html index b606e5db..88f12186 100755 --- a/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html +++ b/js/panels/properties.reel/sections/custom-rows/single-row.reel/single-row.html | |||
| @@ -31,11 +31,11 @@ | |||
| 31 | </script> | 31 | </script> |
| 32 | </head> | 32 | </head> |
| 33 | <body> | 33 | <body> |
| 34 | <div id="section"> | 34 | <div data-montage-id="section"> |
| 35 | <section class="fieldCol"> | 35 | <section class="fieldCol"> |
| 36 | <label><span class="lbl"></span></label> | 36 | <label><span class="lbl"></span></label> |
| 37 | <article class="fieldRow"> | 37 | <article class="fieldRow"> |
| 38 | <div id="slotElement" class="inputField"> | 38 | <div data-montage-id="slotElement" class="inputField"> |
| 39 | 39 | ||
| 40 | </div> | 40 | </div> |
| 41 | </article> | 41 | </article> |