GitHub repository: juanpablorp96/challenge1
Created: 2019-05-30T01:21:07Z
Description: 1. Create a project in github 2. Conflict Challenge: Create a file in master and a branch named bootcamp, modify the file to create a conflict between the two branches and resolve the conflict. 3. Generate a gitignore file to ignore the unnecessary files like the build folder