diff options
| author | kumavis <aaron@kumavis.me> | 2016-06-29 04:21:25 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2016-06-29 04:21:25 +0800 |
| commit | 6238af633056c6136e37106bf5517ef87e3ff8f1 (patch) | |
| tree | 0e687d6f160a426c88bf28e07348dc929bf764a2 /app | |
| parent | f1a94afca73e2af9d227659748d9ec33ee31b9d3 (diff) | |
| download | dexon-wallet-6238af633056c6136e37106bf5517ef87e3ff8f1.tar.gz dexon-wallet-6238af633056c6136e37106bf5517ef87e3ff8f1.tar.zst dexon-wallet-6238af633056c6136e37106bf5517ef87e3ff8f1.zip | |
fix bad merge
Diffstat (limited to 'app')
| -rw-r--r-- | app/scripts/lib/notifications.js | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/scripts/lib/notifications.js b/app/scripts/lib/notifications.js index 35ee5b6d..3d117773 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> |