resolve merge conflict

davidgan1218 · davidgan1218 · commit 95dd1b77c211 · 2023-12-06T11:28:00.000-05:00
diff --git a/src/components/admin.ts b/src/components/admin.ts
@@ -9,7 +9,7 @@ const MOD_USER_ID_FOR_BAN_APPEAL: string = vars.MOD_USER_ID_FOR_BAN_APPEAL;
 const makeBanMessage = (reason: string, days?: number): string =>
   `
 Uh oh, you have been banned from the UW Computer Science Club server ${
-    days ? `and your messages in the past ${days} ${pluralize('day', days)} have been deleted `: ''
+    days ? `and your messages in the past ${days} ${pluralize('day', days)} have been deleted ` : ''
   }for the following reason:
 
 > ${reason}

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ const MOD_USER_ID_FOR_BAN_APPEAL: string = vars.MOD_USER_ID_FOR_BAN_APPEAL;`
`9`	`9`	`const makeBanMessage = (reason: string, days?: number): string =>`
`10`	`10`	`
`11`	`11`	`Uh oh, you have been banned from the UW Computer Science Club server ${`
`12`		- days ? `and your messages in the past ${days} ${pluralize('day', days)} have been deleted `: ''
	`12`	+ days ? `and your messages in the past ${days} ${pluralize('day', days)} have been deleted ` : ''
`13`	`13`	`}for the following reason:`
`14`	`14`
`15`	`15`	`> ${reason}`