About

Resolved a merge conflict. Edited the same line of code in the same file on different branches and merged the branches. Resolved conflicted file by choosing the best commit. Committed your changes and pushed commit to GitHub account

Stars

Watchers

Forks