Skip to content

Commit 9099678

Browse files
authored
fix: Remove accidentally committed merge conflict in CONTRIBUTING.md.
1 parent 936b0b8 commit 9099678

File tree

1 file changed

+1
-4
lines changed

1 file changed

+1
-4
lines changed

CONTRIBUTING.md

+1-4
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,10 @@ Tips for Getting Your Pull Request Accepted
8787
[pubkey]: https://gist.github.com/chriseppstein/3f45d3a8e6fb42f24cb7b3f77f21381e
8888
[disclosure_email]: mailto:[email protected]?subject=Vulnerability%20in%20Github%20LinkedIn/css-blocks%20-%20%3Csummary%3E
8989
[WEBSITE]: ./packages/@css-blocks/website
90-
<<<<<<< HEAD
9190
[PLAYGROUND]: ./packages/@css-blocks/playground
92-
=======
93-
>>>>>>> docs: Instructions on how to see current integrations.
9491
[JSX]: ./packages/@css-blocks/jsx
9592
[GLIMMER]: ./packages/@css-blocks/glimmer
9693
[EMBER_CLI]: ./packages/@css-blocks/ember-cli
9794
[WEBPACK]: ./packages/@css-blocks/webpack
9895
[BROCCOLI]: ./packages/@css-blocks/broccoli
99-
[CSS_BLOCKS_WEBSITE]: http://css-blocks.com
96+
[CSS_BLOCKS_WEBSITE]: http://css-blocks.com

0 commit comments

Comments
 (0)