resolved conflicts
authorWilliam Chang <william@factual.com>
Fri, 10 May 2019 04:16:06 +0000 (21:16 -0700)
committerWilliam Chang <william@factual.com>
Fri, 10 May 2019 04:16:06 +0000 (21:16 -0700)
commit4b2d3288d013b1a71ea25402224c4a8225a099e9
treeb7f5dded777a950e63c4dd967260744336bfaa6b
parent57a6ea11df685d84a1ea07953e88f224ce2b24f7
parentbce391a663d2848bff8ffffca0e4bad771bd3890
resolved conflicts
keyboards/dz60/keymaps/billiams/readme.md