paustint/sfdc-dev-bootcamp-pilot-merge-conflict-ex

Example of resolving merge conflicts

Merge Conflict Example

This repository is used to demonstrate resolving a merge conflict