fix: merge conflict

This commit is contained in:
tglide committed 2023-02-08 10:56:02 +00:00
1 parent 610a82dc42
commit bfcdbafcd2
1 file changed
+10 -8
+10 -8
View File
@@ -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
}