diff --git a/public/404.html b/public/404.html index 9b037ca..7b752c0 100644 --- a/public/404.html +++ b/public/404.html @@ -1,4 +1,8 @@ +<<<<<<< HEAD