Skip to content

Commit e0b6038

Browse files
merged with hello-world-images after fixing conflicts
2 parents dfa79db + 1f1584e commit e0b6038

File tree

3 files changed

+2
-0
lines changed

3 files changed

+2
-0
lines changed

img_hello_git.jpg

51.1 KB
Loading

img_hello_world.jpg

40.6 KB
Loading

index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@
77
<body>
88

99
<h1>Hello world!</h1>
10+
<div><img src="img_hello_world.jpg" alt="Hello World from Space" style="width:100%;max-width:960px"></div>
1011
<p>This is the first file in my new Git Repo.</p>
1112
<p>This line is here to show how merging works.</p>
13+
<div><img src="img_hello_git.jpg" alt="Hello Git" style="width:100%;max-width:640px"></div>
1214

1315
</body>
1416
</html>

0 commit comments

Comments
 (0)