Skip to content

Commit a0791ac

Browse files
committed
Reapply "Update 0.js"
This reverts commit 64c8174.
1 parent 64c8174 commit a0791ac

File tree

1 file changed

+4
-0
lines changed
  • Sprint-2/1-key-errors

1 file changed

+4
-0
lines changed

Sprint-2/1-key-errors/0.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,10 @@ function capitalise(str) {
1313
// but it creates a new one.
1414
// =============> my new code:
1515
function capitalise(str) {
16+
<<<<<<< HEAD
1617
result = `${str[0].toUpperCase()}${str.slice(1)}`;
18+
=======
19+
let result = `${str[0].toUpperCase()}${str.slice(1)}`;
20+
>>>>>>> parent of 3bb9ddf (Update 0.js)
1721
return resault;
1822
}

0 commit comments

Comments
 (0)