practice-git/index.html at main · kris-classes/practice-git · GitHub

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
<! DOCTYPE HTML>
<html>
<head>
<title>Hello World!</title>
<link rel="stylesheet" href="bluestyle.css">
</head>
<body>


<h1>Hello World!</h1>
<div><img scr="img_hello_world.jgp" alt="Hello World from space"
style="width:100%;max-width:960px"></div>
<p>This is the first file in my new Git Repo.</p>
<<<<<<< HEAD
<p>This line is here to show how merging works</p>
=======
<p>A new line in our file!</p>
<p>Adding a new line on 17 Sept</p>

<div><img scr="Island.jgp" alt="Beautiful island"
style="width:100%;max-width:960px"></div>
>>>>>>> hello-world-images

<p>This is for emergency fix2</p>


<p>This line is here to show how merging works.</p>


<p>This line is been added on GitHub for new branch -html-skeleton </p>
</body>
</html>