Built site for gh-pages

Meghansaha · Aug 11, 2024 · a81e43f · a81e43f
1 parent 96a8c6c
commit a81e43f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.nojekyll b/.nojekyll
@@ -1 +1 @@
-db903d57
+fdb818b0
diff --git a/index.html b/index.html
@@ -851,7 +851,7 @@ <h2>What is a Git Merge Conflict?</h2>
 <p>“When someone edits a file and someone else deletes the same file.”</p>
 </div>
 </div>
-<p><br></p>
+<p><br><br></p>
 <p><small>- <a href="https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line">GitHub Docs</a> <em>(“Resolving a merge conflict using the command line”)</em></small></p>
 <aside class="notes">
 <p>-To further contextualize - Only 2</p>

diff --git a/please_let_me_merge.html b/please_let_me_merge.html
@@ -851,7 +851,7 @@ <h2>What is a Git Merge Conflict?</h2>
 <p>“When someone edits a file and someone else deletes the same file.”</p>
 </div>
 </div>
-<p><br></p>
+<p><br><br></p>
 <p><small>- <a href="https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/addressing-merge-conflicts/resolving-a-merge-conflict-using-the-command-line">GitHub Docs</a> <em>(“Resolving a merge conflict using the command line”)</em></small></p>
 <aside class="notes">
 <p>-To further contextualize - Only 2</p>