Skip to content

Commit 3793536

Browse files
authored
Merge pull request #227 from segmentio/repo-sync
repo sync
2 parents 9cc094b + a702583 commit 3793536

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

.github/workflows/grammar-lint.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ jobs:
1717
# https://github.com/errata-ai/write-good/releases/latest/download/write-good.zip
1818

1919
# Optional
20+
<<<<<<< HEAD
2021
config: https://raw.githubusercontent.com/segmentio/segment-docs/develop/.vale.ini
22+
=======
23+
# config: https://raw.githubusercontent.com/errata-ai/vale/master/.vale.ini
24+
>>>>>>> master
2125

2226
# Optional
2327
files: __onlyModified

0 commit comments

Comments
 (0)