diff options
fix bad merge
Diffstat (limited to 'app/scripts')
| -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 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> |