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/dual-row.reel/dual-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/dual-row.reel/dual-row.html')
| -rwxr-xr-x | js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html index d1b5f28b..bdcbff7f 100755 --- a/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html +++ b/js/panels/properties.reel/sections/custom-rows/dual-row.reel/dual-row.html | |||
| @@ -44,17 +44,17 @@ | |||
| 44 | </script> | 44 | </script> |
| 45 | </head> | 45 | </head> |
| 46 | <body> | 46 | <body> |
| 47 | <div id="section"> | 47 | <div data-montage-id="section"> |
| 48 | <section class="fieldCol"> | 48 | <section class="fieldCol"> |
| 49 | <label class="lbl"></label> | 49 | <label class="lbl"></label> |
| 50 | <article class="fieldRow"> | 50 | <article class="fieldRow"> |
| 51 | <div id="slotElement" class="inputField"> | 51 | <div data-montage-id="slotElement" class="inputField"> |
| 52 | 52 | ||
| 53 | </div> | 53 | </div> |
| 54 | </article> | 54 | </article> |
| 55 | <label class="lbl"></label> | 55 | <label class="lbl"></label> |
| 56 | <article class="fieldRow"> | 56 | <article class="fieldRow"> |
| 57 | <div id="slotElement2" class="inputField"> | 57 | <div data-montage-id="slotElement2" class="inputField"> |
| 58 | 58 | ||
| 59 | </div> | 59 | </div> |
| 60 | </article> | 60 | </article> |