merged with hello-world-images after fixing conflicts

Krishna · Krishna · commit fc0caeae2a47 · 2023-04-22T20:36:56.000-04:00
diff --git a/index.html b/index.html
@@ -7,11 +7,14 @@
 <body>
 
 <h1>Hello world!</h1>
-<div><img src="img_hello_world.jpg" alt="Hello World from Space"
-style="width:100%;max-width:960px"></div>
+<div><img src="img_hello_world.jpg" alt="Hello World from Space" style="width:100%;max-width:960px"></div>
 <p>This is the first file in my new Git Repo.</p>
 <p>This line is here to show how merging works.</p>
 
+=======
+<p>A new line in our file!</p>
+<div><img src="img_hello_git.jpg" alt="Hello Git" style="width:100%;max-width:640px"></div>
+>>>>>>> hello-world-images
 
 </body>
-</html>
+</html> 
