Skip to content

Commit c97eec8

Browse files
committed
merged with hello-world-images after fixing conflict
2 parents 5807878 + 1dfc417 commit c97eec8

File tree

4 files changed

+3
-0
lines changed

4 files changed

+3
-0
lines changed

image_hello_git.jfif

15.9 KB
Binary file not shown.

image_hello_world.jpg

79.7 KB
Loading

index.html

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

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

1316
</body>
1417
</html>

trust.png

32.2 KB
Loading

0 commit comments

Comments
 (0)