Added "Merge Conflict" to .NET. (#84)

This commit is contained in:
Zachary Snow 2018-04-04 08:32:21 +02:00 committed by Rajeev N Bharshetty
parent 44784d028f
commit 97fc8b1aa6

View File

@ -47,6 +47,11 @@ List of podcasts which are helpful for software engineers/programmers.
- <b>Description</b>: show covering a broad range of .NET-related topics in considerable technical depth. - <b>Description</b>: show covering a broad range of .NET-related topics in considerable technical depth.
- <b>Frequency</b>: Monthly once - <b>Frequency</b>: Monthly once
- [Merge Conflict](http://www.mergeconflict.fm/)
- <b>Description</b>: Join Frank & James for a weekly discussion on the world of technology and development including C#, F#, .NET, web, mobile, and more.
- <b>Frequency</b>: Weekly
## Agile ## Agile
- [Agile For Humans](https://ryanripley.com/agile-for-humans/) - [Agile For Humans](https://ryanripley.com/agile-for-humans/)