adafruit-mirror/circuitpython-org
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix unresolved merge

Browse source
This commit is contained in:
Melissa LeBlanc-Williams 2025-05-13 10:19:27 -07:00
parent ad8d74e9dd
commit 2c0466bc72
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
_board/maker_badge.md
View file

@ -37,11 +37,7 @@ The Maker badge board is official badge board for Maker Faire´s in Czech republ
## Purchase
<<<<<<< Updated upstream
* [MakerMarket](https://www.makermarket.cz/maker-badge/)
=======
* [Maker Market](https://www.makermarket.cz/maker-badge/)
>>>>>>> Stashed changes
## Resources