GitHub repository: GH-DEV-WS-Ansys-China/conflict-practice-jiamincd
Primary language: JavaScript
Description: Let's resolve some conflicts.