Merge branch 'main' of https://git.levimclean.me/Levi/IWD2-02

Revisions
2026-02-04 11:51:51 -05:00 · 2026-02-04 11:50:51 -05:00
3 changed files with 1 additions and 21 deletions
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <html lang="en">
    <head>
        <title>Levi McLean Lab 2</title>
@@ -23,22 +22,3 @@
        ?>
    </body>
 </html>
-=======
-<?php
-$favorite_ice_cream = "Mint Chocolate Chip";
-$dog_type = "Border Collie";
-$dog_type = 12;
-
-            define("ERROR_MSG", "You have encountered an error, click the back button and try again.");
-
-echo("Hello World! <br>");
-echo("This is PHP. <br>");
-echo("This is the first string " . "this is the second string " . "this is my last string <br>");
-echo("We are in the month of " . date("F") . "<br>");
-echo("The value in the query string for my_var is " . $_REQUEST['my_var'] . "<br>");
-echo("My favorite flavour of ice cream is " . $favorite_ice_cream . "<br>");
-echo("My dog is a " . $dog_type . "<br>");
-echo("My dog is a " . $dog_type . "<br>");
-echo ERROR_MSG;
-?>
->>>>>>> 8711fbbbbb7d847daf7de42f4de6cd8e6f7d1965
@@ -25,7 +25,7 @@

            greet("Levi", "McLean");

-            greet2()
+            greet2();

            $result = add(5, 3);
            echo $result;
Author	SHA1	Message	Date
LeviM0323	59948ed75c	Merge branch 'main' of https://git.levimclean.me/Levi/IWD2-02	2026-02-04 11:51:51 -05:00
LeviM0323	6a0e933576	Revisions	2026-02-04 11:50:51 -05:00