From 2247c5953d441b773115239a7f62ad7a25cfbe01 Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 19 Jun 2019 13:33:06 +0100
Subject: [PATCH] Fix conflicting PRs

---
 src/RoomNotifs.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/RoomNotifs.js b/src/RoomNotifs.js
index a21ec30d93..2d5e4b3136 100644
--- a/src/RoomNotifs.js
+++ b/src/RoomNotifs.js
@@ -41,8 +41,8 @@ export function countRoomsWithNotif(rooms) {
         const highlight = room.getUnreadNotificationCount('highlight') > 0;
         const notificationCount = room.getUnreadNotificationCount();
 
-        const notifBadges = notificationCount > 0 && _shouldShowNotifBadge(roomNotifState);
-        const mentionBadges = highlight && _shouldShowMentionBadge(roomNotifState);
+        const notifBadges = notificationCount > 0 && shouldShowNotifBadge(roomNotifState);
+        const mentionBadges = highlight && shouldShowMentionBadge(roomNotifState);
         const isInvite = room.hasMembershipState(MatrixClientPeg.get().credentials.userId, 'invite');
         const badges = notifBadges || mentionBadges || isInvite;