Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,11 @@
Header 123
</header>
<main>
<h1>Git webinar</h1>
<<<<<<< HEAD
<h1>Git webinar MASTER</h1>
=======
<h1>Git webinar GH PAGES</h1>
>>>>>>> d8057c0... gh-pages

<section>
Main content
Expand Down