Изменил исходиный файл modal.js, при возникновении конфликта

93a037fa · Владислав Цой · be39487b · 66482a05 · 93a037fa
Commit 93a037fa authored Dec 16, 2020 by Владислав Цой
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

modal.js js/modal.js +4 -2

No files found.
--- a/js/modal.js
+++ b/js/modal.js
 const num = 1;
-
+const string = "Hello";
 const sum = (a, b) => a + b;

 const num2 = 4;

-const result = sum(num, num2);
\ No newline at end of file
+const result = sum(num, num2);
+console.log(string);
+