remove synthing conflict file (#6717)
authorFrancis St-Amour <fstamour@users.noreply.github.com>
Wed, 11 Sep 2019 02:51:21 +0000 (22:51 -0400)
committerfauxpark <fauxpark@gmail.com>
Wed, 11 Sep 2019 02:51:21 +0000 (12:51 +1000)
commit68dbf92d9ed0612e20c71a8ad71418b683999e8d
treec6fad987fbbbebdc0314ca04d5ad6a6c31fa1cfd
parent595232ec989499d0ee0b8db0b55f6e8ca418c786
remove synthing conflict file (#6717)
keyboards/planck/keymaps/hieax/hiea.sync-conflict-20180501-144403-SMV4TP4.h [deleted file]