open-source-assignment / merge-test

Go to a project
Toggle navigation Toggle navigation pinning
Lee SeJin
cd3ac9c5 1 parent 66a2b1c2

yes

Inline Side-by-side
Showing 1 changed file with 3 additions and 0 deletions
...@@ -12,4 +12,7 @@ function b(){ ...@@ -12,4 +12,7 @@ function b(){
12 function c(){ 12 function c(){
13 return console.log("wawa"); 13 return console.log("wawa");
14 >>>>>>> second 14 >>>>>>> second
15 +}
16 +function g(){
17 + return console.log("this is last line");
15 } 18 }
...\ No newline at end of file ...\ No newline at end of file
......