Revisions
This commit is contained in:
@@ -1,4 +1,3 @@
|
|||||||
<<<<<<< HEAD
|
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
<head>
|
<head>
|
||||||
<title>Levi McLean Lab 2</title>
|
<title>Levi McLean Lab 2</title>
|
||||||
@@ -23,22 +22,3 @@
|
|||||||
?>
|
?>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</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");
|
greet("Levi", "McLean");
|
||||||
|
|
||||||
greet2()
|
greet2();
|
||||||
|
|
||||||
$result = add(5, 3);
|
$result = add(5, 3);
|
||||||
echo $result;
|
echo $result;
|
||||||
|
|||||||
Binary file not shown.
Reference in New Issue
Block a user