rcorp / standard-project-structure

A mission to improve developer productivity. Automate Everything ™ !
Apache License 2.0
5 stars 3 forks source link

Merge conflict code. #69

Open neerajsachan opened 7 years ago

neerajsachan commented 7 years ago

Usage the apm plugin merge-conflict for resolving git merge conflicts in Atom . For reference follow the link https://atom.io/packages/merge-conflicts .