diff --git a/hello2.txt b/hello2.txt index 4789c97153129630c82c964d0d666a6d4cb1ec9d..30df60b484fc723d51de92f6ab97d79d2dea8b3a 100644 --- a/hello2.txt +++ b/hello2.txt @@ -1,4 +1,4 @@ pleasemidify in pc please -lululala>>>>>>> b4004cdf6b409d18a5fb84f83d4aae6e04fc0407 -modify in branch \ No newline at end of file +lululala>>>>>>> modify by ijnil +