TurnerBroadcasting/MTS-Code-Guidelines — pull request #22 by jamsyoung (2014-08-14 20:36:53+00:00)
Title: Feature/update conflict resolution

- Moved Changelog to its own file

- Added a Conflict Resolution section.

tl;dr - The RC files always win.