diff --git a/index.html b/index.html index 39f1b67..8d8015d 100644 --- a/index.html +++ b/index.html @@ -17,7 +17,11 @@ Header 123
-

Git webinar

+<<<<<<< HEAD +

Git webinar MASTER

+======= +

Git webinar GH PAGES

+>>>>>>> d8057c0... gh-pages
Main content