From 791850c89a76ee25a29527165809179ce2aee5ca Mon Sep 17 00:00:00 2001 From: Peter Morrison <30943236+PeterMorrison1@users.noreply.github.com> Date: Fri, 30 Sep 2022 23:01:05 -0600 Subject: [PATCH] Update free-podcasts-screencasts-en.md (#7151) * Update free-podcasts-screencasts-en.md * Update free-podcasts-screencasts-en.md Co-authored-by: Peter Morrison --- casts/free-podcasts-screencasts-en.md | 1 + 1 file changed, 1 insertion(+) diff --git a/casts/free-podcasts-screencasts-en.md b/casts/free-podcasts-screencasts-en.md index 5d4d5bcd9..69f7f775b 100644 --- a/casts/free-podcasts-screencasts-en.md +++ b/casts/free-podcasts-screencasts-en.md @@ -251,6 +251,7 @@ * [Ladybug Podcast](https://www.ladybug.dev) - Kelly Vaughn, Ali Spittel, Emma Bostian, Sidney Buckner (podcast) * [Learn to Code with Me](https://learntocodewith.me/podcast/) - Laurence Bradford (podcast) * [Loosely Coupled](https://looselycoupled.info) - Jeff Carouth, Matt Frost (podcast) +* [Merge Conflict](https://www.mergeconflict.fm) - Frank Krueger, James Montemagno (podcast) * [.NET Rocks!](https://www.dotnetrocks.com) - Carl Franklin, Richard Campbell (podcast) * [Open Source System Podcast](https://opensourcesystempodcast.vf.io) - Vlad Filippov, Kyle Robinson Young, Tim Branyen, Darcy Clarke, Mike Taylor, Alex Sexton, Jason Etcovitch (podcast) * [Programming Throwdown](https://www.programmingthrowdown.com) - Jason Gauci, Patrick Wheeler (podcast)