Skip to content

Commit 8fbde1f

Browse files
idlebergidleberg
committed
resolve conflict
2 parents f8dcb25 + ec35329 commit 8fbde1f

File tree

4 files changed

+527
-53
lines changed

4 files changed

+527
-53
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ yarn global add yo || npm install -g yo
1919

2020
## Installation
2121

22-
Use your preferred package manager to install this generator
22+
Use your preferred package manager to install this generator
2323

2424
```sh
2525
yarn global add generator-hljs || npm i generator-hljs -g

‎package-lock.json‎

Lines changed: 21 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "generator-hljs",
3-
"version": "0.1.0",
3+
"version": "0.2.2",
44
"description": "Yeoman generator for Highlight.js",
55
"files": [
66
"generators"

0 commit comments

Comments
 (0)