From bfcdbafcd253748e1364deb3a5a6430209312357 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Wed, 8 Feb 2023 10:56:02 +0000 Subject: [PATCH] fix: merge conflict --- src/lib/helpers/string.ts | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/lib/helpers/string.ts b/src/lib/helpers/string.ts index e8ddc3a53..d479aca05 100644 --- a/src/lib/helpers/string.ts +++ b/src/lib/helpers/string.ts @@ -1,20 +1,22 @@ /** -<<<<<<< HEAD * Capitalizes the first letter of a string -======= - * Given a string, returns the singular version of it, - * by removing the trailing 's'. ->>>>>>> main * * @export * @param {string} str * @returns {string} */ -<<<<<<< HEAD export function capitalize(str: string): string { return str.charAt(0).toUpperCase() + str.slice(1); -======= +} + +/** + * Given a string, returns the singular version of it, + * by removing the trailing 's'. + * + * @export + * @param {string} str + * @returns {string} + */ export function singular(str: string): string { return str.replace(/s$/, ''); ->>>>>>> main }