Merge branch 'MAGETWO-35341' into PR

guz-anton · guz-anton · commit fb646b0d993a · 2015-03-20T16:51:38.000+02:00
diff --git a/lib/web/mage/backend/notification.js b/lib/web/mage/backend/notification.js
@@ -13,7 +13,7 @@ define([
     $.widget('mage.notification', {
         options: {
             templates: {
-                global: '<div class="messages"><div class="message <%- if (data.error) { %>error<% } %>"><div><%- data.message %></div></div></div>'
+                global: '<div class="messages"><div class="message <% if (data.error) { %>error<% } %>"><div><%- data.message %></div></div></div>'
             }
         },
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ define([`
`13`	`13`	`$.widget('mage.notification', {`
`14`	`14`	`options: {`
`15`	`15`	`templates: {`
`16`		`- global: '<div class="messages"><div class="message <%- if (data.error) { %>error<% } %>"><div><%- data.message %></div></div></div>'`
	`16`	`+ global: '<div class="messages"><div class="message <% if (data.error) { %>error<% } %>"><div><%- data.message %></div></div></div>'`
`17`	`17`	`}`
`18`	`18`	`},`
`19`	`19`