GitHub repository: KatiePee/resolving-conflicts-practice
Created: 2023-01-16T20:54:40Z
Description: More practice with git, focusing on merging and resolving conflicts.