Skip to content

Branch2 #121

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
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

Branch2 #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
eb1aea6
Изменение года в файле LICENSE.md!
nonachi Mar 31, 2025
1403be6
Изменение имени в файле README.md!
nonachi Mar 31, 2025
35b977e
Создание файла newFile.txt!
nonachi Mar 31, 2025
4fb2da9
Изменение года в файле LICENSE.md!
nonachi Mar 31, 2025
668a903
Изменение имени в файле README.md!
nonachi Mar 31, 2025
37adbb3
Создание файла newFile.txt!
nonachi Mar 31, 2025
046d752
Разрешение конфликтов при слиянии веток!
nonachi Mar 31, 2025
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
2 changes: 1 addition & 1 deletion LICENSE.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018—preset Artem Zakharchenko
Copyright (c) 2019—preset Artem Zakharchenko

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ Use English language when naming your variables and functions.

```js
/* Bad */
const primerNombre = 'Gustavo'
const primerNombre = 'Olesya'
const amigos = ['Kate', 'John']

/* Good */
Expand Down
4 changes: 4 additions & 0 deletions newFile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
name=Рыцарь
age=18
city=Акалиф
[email protected]