aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/lib
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2016-06-29 04:21:25 +0800
committerkumavis <aaron@kumavis.me>2016-06-29 04:21:25 +0800
commit6238af633056c6136e37106bf5517ef87e3ff8f1 (patch)
tree0e687d6f160a426c88bf28e07348dc929bf764a2 /app/scripts/lib
parentf1a94afca73e2af9d227659748d9ec33ee31b9d3 (diff)
downloadtangerine-wallet-browser-6238af633056c6136e37106bf5517ef87e3ff8f1.tar
tangerine-wallet-browser-6238af633056c6136e37106bf5517ef87e3ff8f1.tar.gz
tangerine-wallet-browser-6238af633056c6136e37106bf5517ef87e3ff8f1.tar.bz2
tangerine-wallet-browser-6238af633056c6136e37106bf5517ef87e3ff8f1.tar.lz
tangerine-wallet-browser-6238af633056c6136e37106bf5517ef87e3ff8f1.tar.xz
tangerine-wallet-browser-6238af633056c6136e37106bf5517ef87e3ff8f1.tar.zst
tangerine-wallet-browser-6238af633056c6136e37106bf5517ef87e3ff8f1.zip
fix bad merge
Diffstat (limited to 'app/scripts/lib')
-rw-r--r--app/scripts/lib/notifications.js7
1 files changed, 1 insertions, 6 deletions
diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js
index 35ee5b6d7..3d1177735 100644
--- a/app/scripts/lib/notifications.js
+++ b/app/scripts/lib/notifications.js
@@ -144,13 +144,8 @@ function renderNotificationSVG(content, cb){
}
function svgWrapper(content){
-<<<<<<< HEAD
- var wrapperSource = `
- <svg xmlns="http://www.w3.org/2000/svg" width="360" height="240">
-=======
var wrapperSource = `
- <svg xmlns="http://www.w3.org/2000/svg" width="450" height="300">
->>>>>>> master
+ <svg xmlns="http://www.w3.org/2000/svg" width="360" height="240">
<foreignObject x="0" y="0" width="100%" height="100%">
<body xmlns="http://www.w3.org/1999/xhtml" height="100%">{{content}}</body>
</foreignObject>