Skip to content

СедьмаяВетка #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Eeveevil wants to merge 2 commits into
base: main
Choose a base branch
from
Open

СедьмаяВетка #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c76a88f
Файлы восьмой ветки
Eeveevil May 25, 2021
0700b98
Файлы седьмой ветки
Eeveevil May 25, 2021
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 1.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<title>Первый тестовый файл</title>
<<<<<<< Восьмаяветка
<title>Первый тестовый файл(восьмая ветка)</title>
=======
<title>Первый тестовый файл(седьмая ветка)</title>
>>>>>>> Файлы седьмой ветки
</head>
</html>
6 changes: 5 additions & 1 deletion 2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
<!DOCTYPE html>
<html>
<head>
<title>Второй тестовый файл</title>
<<<<<<< Восьмаяветка
<title>Второй тестовый файл(восьмая ветка)</title>
=======
<title>Второй тестовый файл(седьмая ветка)</title>
>>>>>>> Файлы седьмой ветки
</head>
</html>