/
hello.html
75 lines (68 loc) · 1.49 KB
/
hello.html
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
<<<<<<< HEAD
<!DOCTYPE html>
<html>
<head>
<title>
My first website
</title>
<style>
table{
border: 2px solid red;
border-collapse: collapse;
padding: 20px;
}
td,th{
border: 1px solid black;
}
th{
background-color: red;
}
</style>
</head>
<body>
<h2>Hello whats up! Making a change</h2>
<!-- this is a comment -->
<ul>
<li>Coffee</li>
<li>Tea</li>
<li>Milk</li>
</ul>
<ol>
<li>Coffee</li>
<li>Tea</li>
<li>Milk</li>
</ol>
<img src = "HarvardPic2.jpg"/>
<h2>Lunch Menu</h2>
<table>
<tr>
<th> Day</th>
<th> Price</th>
</tr>
<tr>
<td> Monday </td>
<td> $6 </td>
</tr>
<tr>
<td> Friday </td>
<td> $7 </td>
</tr>
</table>
<form>
<input type = "text" placeholder = "Type Your Name" name = "name"/>
<button>Submit</button>
</form>
</body>
</html>
=======
<DOCTYPE html>
<head>
<title>
My first website
</title>
</head>
<body>
Hello whats up! Making a change
</body>
</DOCTYPE>
>>>>>>> 4668d8efd11bdef85f3a69d354c4b7ea92a60fbf