summaryrefslogtreecommitdiff
path: root/scripts/lint-conflicts.sh
Commit message (Expand)AuthorAgeFilesLines
* Make sure we didn't commit conflictsLin Jen-Shin (godfat)2017-08-011-0/+5