Skip to content

Commit

Permalink
Merge branch 'main' into separateNonFeaturedArticlesOnQuadrantView
Browse files Browse the repository at this point in the history
# Conflicts:
#	.lintstagedrc
#	dist_scripts/src/model.js
#	src/animation.ts
#	src/components/Item/Item.tsx
#	src/components/ItemList/ItemList.tsx
#	src/components/PageItem/PageItem.tsx
#	src/index.scss
#	src/model.js
#	src/model.ts
  • Loading branch information
bmsuseluda committed Jun 17, 2021
1 parent 9f083e7 commit f427ee5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion .lintstagedrc.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"*.{json, md, yml, js, ts, tsx}": ["prettier --write"]
"*.{json, md, yml, js, ts, tsx, scss}": ["prettier --write"]
}

0 comments on commit f427ee5

Please sign in to comment.