GitHub repository: teradyne-dev-workshops/conflict-practice-erick-m-teradyne
Primary language: JavaScript
Description: Let's resolve some conflicts.