Skip to content

Commit

Permalink
Fix conflict from merge
Browse files Browse the repository at this point in the history
Matthaios Stavrou authored and Matthaios Stavrou committed Aug 3, 2018
2 parents 88e74cd + 4dabfca commit b541616
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions simple.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<!DOCTYPE html>
<!--
Copyright training 2018 Manthos
Some silly changes
Adding changes before rebase conflict
-->
<head>
<title>An example website</title>
@@ -18,9 +18,9 @@
</head>
<body>
<main class="container">
<!-- Junk Goes Here -->
<!-- Content Goes Here -->
<p>
Just some content
Lots of Trouble, in a little repository
</p>
</main>
<footer class="container">

0 comments on commit b541616

Please sign in to comment.