diff --git a/README.md b/README.md index 82a6c31..76941d0 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,9 @@ -<<<<<<< HEAD -
+
======= -
->>>>>>> 295f244501de9e6ce90d4f86fc9704da4c0506a5 +
# Edge-Engine