Skip to content

Commit 5bcc14b

Browse files
authored
Merge pull request #102 from oshi97/patch-1
fix readme typos
2 parents dc14e5e + ff78324 commit 5bcc14b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ const tailwindMergeConfig = {
176176
// Class groups are defined here
177177
},
178178
conflictingClassGroups: {
179-
// Conflcits between class groups are defined here
179+
// Conflicts between class groups are defined here
180180
},
181181
}
182182
```
@@ -214,7 +214,7 @@ const fillClassGroup = [{ fill: ['current', isArbitraryValue] }]
214214

215215
Because the function is under the `fill` key, it will only get called for classes which start with `fill-`. Also, the function only gets passed the part of the class name which comes after `fill-`, this way you can use the same function in multiple class groups. tailwind-merge exports its own [validators](#validators), so you don't need to recreate them.
216216

217-
You can use am empty string (`''`) as a class part if you want to indicate that the preceding part was the end. This is useful for defining elements which are marked as `DEFAULT` in the Tailwind config.
217+
You can use an empty string (`''`) as a class part if you want to indicate that the preceding part was the end. This is useful for defining elements which are marked as `DEFAULT` in the Tailwind config.
218218

219219
```ts
220220
// ↓ Resolves to filter and filter-none

0 commit comments

Comments
 (0)