aboutsummaryrefslogtreecommitdiff
path: root/keyboards/planck/keymaps/hieax/hiea.sync-conflict-20180501-144403-SMV4TP4.h
Commit message (Expand)AuthorAgeFilesLines
* remove synthing conflict file (#6717)Francis St-Amour2019-09-111-97/+0
* update with qmk master (#2887)sdothum2018-05-041-0/+97