GitHub repository: m-deluca/conflict-example-f23
Created: 2023-10-01T19:25:25Z
Description: This repo is for demonstrating how to set solve a merge conflict.