From 6238af633056c6136e37106bf5517ef87e3ff8f1 Mon Sep 17 00:00:00 2001 From: kumavis Date: Tue, 28 Jun 2016 13:21:25 -0700 Subject: fix bad merge --- app/scripts/lib/notifications.js | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'app/scripts') 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 = ` - -======= var wrapperSource = ` - ->>>>>>> master + {{content}} -- cgit