Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
D
developer-guide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
zk
developer-guide
Commits
c9472837
Commit
c9472837
authored
Dec 01, 2019
by
Колесников Илья
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update 3.2-atom.md
parent
e052fe4f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
3.2-atom.md
3-software/3.2-atom.md
+1
-1
No files found.
3-software/3.2-atom.md
View file @
c9472837
...
...
@@ -20,5 +20,5 @@
-
[
*merge-conflicts*
](
//atom.io/packages/merge-conflicts
)
- merge-tool для разрешения конфликтов в Git;
```
bash
apm
install
git-time-machine linter linter-eslint linter-less linter-php linter-htmlhint git-control emmet docblockr editorconfig language-pug merge-conflicts
apm
install
git-time-machine linter linter-eslint linter-less linter-php linter-htmlhint git-control emmet docblockr editorconfig language-pug merge-conflicts
minimap copy-path uikit-atom atom-typescript file-icons language-vue vuejs2-snippets angular-2-typescript-snippets
```
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment