From 5841e402ca6a1e46884f1e28d8ff46ef1b5dd96c Mon Sep 17 00:00:00 2001
From: mpone <m.parphenjuk@gmail.com>
Date: Sun, 21 Jun 2020 18:42:47 +0300
Subject: [PATCH 1/2] master

---
 index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.html b/index.html
index 39f1b67..5acbf77 100644
--- a/index.html
+++ b/index.html
@@ -17,7 +17,7 @@
 		Header 123
 	</header>
 	<main>
-		<h1>Git webinar</h1>
+		<h1>Git webinar MASTER</h1>
 
 		<section>
 			Main content

From a14ffbc713c17787e448109ec28fb2b14956b8a9 Mon Sep 17 00:00:00 2001
From: mpone <m.parphenjuk@gmail.com>
Date: Sun, 21 Jun 2020 18:35:06 +0300
Subject: [PATCH 2/2] gh-pages

---
 index.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/index.html b/index.html
index 5acbf77..8d8015d 100644
--- a/index.html
+++ b/index.html
@@ -17,7 +17,11 @@
 		Header 123
 	</header>
 	<main>
+<<<<<<< HEAD
 		<h1>Git webinar MASTER</h1>
+=======
+		<h1>Git webinar GH PAGES</h1>
+>>>>>>> d8057c0... gh-pages
 
 		<section>
 			Main content