diff --git a/app/Views/welcome_message.php b/app/Views/welcome_message.php index f1c997f..2e018e3 100644 --- a/app/Views/welcome_message.php +++ b/app/Views/welcome_message.php @@ -79,7 +79,7 @@ @@ -317,7 +317,11 @@ +<<<<<<< HEAD +======= + + +>>>>>>> bcc5077f2d53a3d6151c74d9fd3680af7743a82c