Merge pull request #35 from Liongrass/master

update list of cities

Author: Liongrass

_posts/2023-06-22-vancouver-socratic-14.md

@@ -88,7 +88,7 @@ Welcome Elenctics to tonight's Socratic Seminar!
 
 - [Bitcoin Rodeo 2023](http://bitcoinrodeo.com/)
 - [TabConf 2023 - Technical Bitcoin Conference](https://2023.tabconf.com/)
-- [Adam Soltys on "Boomer Bedtime Stories](https://www.boomerbedtimestoryradio.com/post/bitcoin-for-boomers)
+- [Adam Soltys on "Boomer Bedtime Stories"](https://www.boomerbedtimestoryradio.com/post/bitcoin-for-boomers)
 
 ## Miscellaneous
 

cities.md

@@ -10,7 +10,6 @@ This format has since spread all around the world, including Vancouver. We encou
 
 ### Canada
 
-- [Toronto](https://www.meetup.com/bitcointo/)
 - [Vancouver](https://bitdevs.ca/)
 - [Victoria](https://bitdevsvictoria.org)
 
@@ -32,15 +31,9 @@ This format has since spread all around the world, including Vancouver. We encou
 ### Overseas
 
 - [Amsterdam](https://bitdevsamsterdam.org/)
-<<<<<<< HEAD
-=======
 - [Athens](https://bitdevs-athens.com/)
 - [Berlin](https://bitdevs.berlin/)
 - [London](https://londonbitdevs.org/)
 - [Melbourne](https://github.com/MelbourneBitDevs/MelbBitDevs/)
 - [São Paulo](https://saopaulobitdevs.org/)
->>>>>>> 2ca40a8d0bc1137c458c95045e9a397819e3c5ce
-- [Berlin](https://bitdevs.berlin/)
-- [London](https://londonbitdevs.org/)
-- [São Paulo](https://bitdevsportugues.org/)
 - [Taipei](https://bitdevs.tw/)