diff --git a/INFO-1208 (PHP)/Labs/Lab 2/l_mclean215318_week2.php b/INFO-1208 (PHP)/Labs/Lab 2/l_mclean215318_week2.php index a054efd..c86c44f 100644 --- a/INFO-1208 (PHP)/Labs/Lab 2/l_mclean215318_week2.php +++ b/INFO-1208 (PHP)/Labs/Lab 2/l_mclean215318_week2.php @@ -1,3 +1,4 @@ +<<<<<<< HEAD