fixed conflict in readme
authorWilliam Chang <william@factual.com>
Fri, 10 May 2019 23:44:13 +0000 (16:44 -0700)
committerWilliam Chang <william@factual.com>
Fri, 10 May 2019 23:44:13 +0000 (16:44 -0700)
commit10975bd4c08a598eed2c74dab0d3187fbbf4b8f5
tree3ad0472dde9e18b5ce875043c837709ca32eea6f
parent9ce186860e78d5afe350636cb7445e18c2577f33
parentfebaf9dec42ce4d4ade316f811145a291137ee94
fixed conflict in readme