fix: fixed text appearance

openedx · Mar 4, 2024 · 5ec4893 · 5ec4893
1 parent c5c0cf5
commit 5ec4893
Showing 1 changed file with 0 additions and 3 deletions.
diff --git 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',