diff --git a/README.md b/README.md index 47db52cd75399dd46f7889a6ed9f5196577ec15c..7ab4e9cd7be92a522dece2e1969d5cfaf0ea61d9 100644 --- a/README.md +++ b/README.md @@ -5,5 +5,7 @@ test-project - I edited at Web * 201521008 - I edited at oss044@ SSH * 05031213 - I edited at ssh * 05031225 - edit again +* 05031227 - edit PC * 05031230 - I edited at PC * 05031258 - I edited at Web +* 05031313 - I solve Conflict