m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

fix bad merge

Browse Source
This commit is contained in:
kumavis 2016-06-28 13:21:25 -07:00
parent f1a94afca7
commit 6238af6330
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/scripts/lib/notifications.js
View File

@ -144,13 +144,8 @@ function renderNotificationSVG(content, cb){
} }
function svgWrapper(content){ function svgWrapper(content){
<<<<<<< HEAD
var wrapperSource = `
<svg xmlns="http://www.w3.org/2000/svg" width="360" height="240">
=======
var wrapperSource = ` var wrapperSource = `
<svg xmlns="http://www.w3.org/2000/svg" width="450" height="300"> <svg xmlns="http://www.w3.org/2000/svg" width="360" height="240">
>>>>>>> master
<foreignObject x="0" y="0" width="100%" height="100%"> <foreignObject x="0" y="0" width="100%" height="100%">
<body xmlns="http://www.w3.org/1999/xhtml" height="100%">{{content}}</body> <body xmlns="http://www.w3.org/1999/xhtml" height="100%">{{content}}</body>
</foreignObject> </foreignObject>