Done resolving merge conflicts

sjm2932 · Dec 22, 2021 · 85cddfb · 85cddfb
2 parents e646529 + a3d9bb9
commit 85cddfb
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/simple.html b/simple.html
@@ -17,12 +17,11 @@
 	<main class="container">
 	<!-- Content Goes Here -->
 		<p>
-			I'm not sure what will go here, but I'm sure
-			it will be nice.
+			Just some content
 		</p>
 	</main>
 	<footer class="container">
-		<p>&copy; Kevin Song</p>
+		<p>&copy; Git Training 2021</p>
 	</footer>
 </body>
 </html>