From 5ec4893f472741c04b1af2a37caf4738a8b80117 Mon Sep 17 00:00:00 2001
From: ayeshoali <ayeshoali@gmail.com>
Date: Mon, 4 Mar 2024 17:21:14 +0500
Subject: [PATCH] fix: fixed text appearance

---
 src/notification-preferences/messages.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/notification-preferences/messages.js b/src/notification-preferences/messages.js
index c146c4b97..d1b8fbb15 100644
--- a/src/notification-preferences/messages.js
+++ b/src/notification-preferences/messages.js
@@ -24,11 +24,8 @@ const messages = defineMessages({
       core {Core notifications}
       newDiscussionPost {New discussion posts}
       newQuestionPost {New question posts}
-<<<<<<< HEAD
       contentReported {Reported content}
-=======
       courseUpdate {Course updates}
->>>>>>> c19145e (fix: add correct strings for new course update notifications)
       other {{text}}
     }`,
     description: 'Display text for Notification Types',