diff --git a/README.md b/README.md index 29909f0..01f6552 100644 --- a/README.md +++ b/README.md @@ -1,5 +1 @@ -<<<<<<< HEAD --bmaster-003 -======= --amaster-003 ->>>>>>> 0b221ceeb840b8d77aebe8a3be205aa8e62b856f +-c \ No newline at end of file