diff --git a/README.md b/README.md index 56bca50..bca78fa 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,10 @@
+<<<<<<< Updated upstream +======= + +>>>>>>> Stashed changes