From 8c611ff5b9e35ed4f5563a8e7be7a490f21a288f Mon Sep 17 00:00:00 2001
From: Matthew R <matthew@staff.libraryofcode.org>
Date: Tue, 5 May 2020 19:52:45 -0400
Subject: [PATCH] fix conflict

---
 src/intervals/memory.ts | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/intervals/memory.ts b/src/intervals/memory.ts
index bb69754..307d0fe 100644
--- a/src/intervals/memory.ts
+++ b/src/intervals/memory.ts
@@ -1,3 +1,4 @@
+/* eslint-disable no-useless-escape */
 /* eslint-disable no-continue */
 /* eslint-disable no-await-in-loop */
 import { Client } from '..';
@@ -73,9 +74,10 @@ export default function memory(client: Client) {
           if ((memoryConversion >= acc.ramLimitNotification) && (acc.ramLimitNotification !== 0)) {
             const notifyEmbed = new RichEmbed()
               .setTitle('Cloud Account | Notification')
-              .setDescription(`You are about to reach your RAM resource limits, you are currently using '${String(Math.round(memoryConversion))} MB' and your limit is '${String(userLimits.hard)} MB'. Please correct your usage to avoid further action.\nYou can set your notification preferences by running \`=limits set-ram-notification <preferred ram threshold in MB>\`, you can disable these notifications by running \`=limits set-ram-notification -1\`.`)
+              .setDescription(`You are about to reach your RAM resource limits, you are currently using '${String(Math.round(memoryConversion))} MB' and your limit is '${String(userLimits.hard)} MB'. Please correct your usage to avoid further action.`)
               .addField('User', `${acc.username} | <@${acc.userID}>`, true)
               .addField('Technician', 'SYSTEM', true)
+              .addField('Additional Information', 'This notification was sent by the system. You can set your notification preferences by running \`=limits set-ram-notification <preferred ram threshold in MB>\`, you can disable these notifications by running \`=limits set-ram-notification -1\`.')
               .setFooter(client.user.username, client.user.avatarURL)
               .setTimestamp();
             client.getDMChannel(acc.userID).then((channel) => {