Skip to content
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

Jump to bottom

Fix l51 #607

Merged
merged 6 commits into from
Mar 31, 2022
Merged

Fix l51 #607

merged 6 commits into from
Mar 31, 2022

Conversation

mikhaylov-ya
Copy link
Contributor

Правка маркдауна урока 51

@mikhaylov-ya
Copy link
Contributor Author

@amshkv

mokevnin
mokevnin reviewed Mar 31, 2022
View reviewed changes
modules/40-define-functions/450-define-functions-short-syntax/description.ru.yml Outdated
@@ -14,7 +14,12 @@ theory: |
Здесь используется много дополнительных символов и слово `return`. С версии es6, в языке появился альтернативный, сокращенный синтаксис, который, в некоторых ситуациях, значительно упрощает восприятие и сокращает количество кода.

```javascript
// Требуется немного времени на привыкание к этой форме, но потом вы не сможете без неё жить
<<<<<<< HEAD
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Не разрешил правильно конфликт)

@amshkv

Copy link
Contributor Author

@mikhaylov-ya mikhaylov-ya Mar 31, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

разрешение в полете

@NatalieKonstantinova NatalieKonstantinova merged commit 86829a8 into hexlet-basics:main Mar 31, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@mokevnin mokevnin mokevnin left review comments

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@mikhaylov-ya @mokevnin @NatalieKonstantinova