aboutsummaryrefslogtreecommitdiff
path: root/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
diff options
context:
space:
mode:
authorNivesh Rajbhandari2012-05-04 15:33:29 -0700
committerNivesh Rajbhandari2012-05-04 15:33:29 -0700
commitad94ec51c81badeba2b0f870cad8a0eec7878ebd (patch)
tree35c52d44d2c5399ea4019582af3fb55a53ee05c8 /js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
parent3ad9024bcfce76e28816daa02bac14fc8985ca62 (diff)
parent3ebed34665fa73b0ce613b400f3029ebf4476439 (diff)
downloadninja-ad94ec51c81badeba2b0f870cad8a0eec7878ebd.tar.gz
Merge branch 'refs/heads/dom-architecture-master' into Dom-Architecture
Diffstat (limited to 'js/panels/color/colorpanelpopup.reel/colorpanelpopup.html')
-rwxr-xr-xjs/panels/color/colorpanelpopup.reel/colorpanelpopup.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
index 0698a6dc..f65d5bc0 100755
--- a/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
+++ b/js/panels/color/colorpanelpopup.reel/colorpanelpopup.html
@@ -26,7 +26,7 @@
26 26
27 <body> 27 <body>
28 28
29 <div id="cpp_popup" class="cpp_popup"> 29 <div data-montage-id="cpp_popup" class="cpp_popup">
30 <div class="cp_pu_options"> 30 <div class="cp_pu_options">
31 31
32 <div class="cp_pu_history"> 32 <div class="cp_pu_history">