8000 Fix unresolved merge · cezer-io/circuitpython-org@2c0466b · GitHub
[go: up one dir, main page]
Skip to content

Commit 2c0466b

Browse files
makermelissamakermelissa
committed
Fix unresolved merge
1 parent ad8d74e commit 2c0466b

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

‎_board/maker_badge.md

Lines changed: 0 additions & 4 deletions
< 4A4C td data-grid-cell-id="diff-b7e54caf6cf444cea058170163aa5fa910b93ddd6a73cf3c7a64d2bb46af015f-44-40-0" data-selected="false" role="gridcell" style="background-color:var(--diffBlob-deletionNum-bgColor, var(--diffBlob-deletion-bgColor-num));text-align:center" tabindex="-1" valign="top" class="focusable-grid-cell diff-line-number position-relative left-side">44
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@ The Maker badge board is official badge board for Maker Faire´s in Czech republ
3737

3838
## Purchase
3939

40-
<<<<<<< Updated upstream
4140
* [MakerMarket](https://www.makermarket.cz/maker-badge/)
42-
=======
43-
* [Maker Market](https://www.makermarket.cz/maker-badge/)
-
>>>>>>> Stashed changes
4541

4642
## Resources
4743

0 commit comments

Comments
 (0)
0