GitHub repository: loopcamp-james/LOOP_resolve_git_conflicts
Primary language: Java
Description: fork of original project