fix merge conflict
authorSachin Joshi <satchin.joshi@gmail.com>
Thu, 23 May 2019 07:45:12 +0000 (09:45 +0200)
committerSachin Joshi <satchin.joshi@gmail.com>
Thu, 23 May 2019 07:45:12 +0000 (09:45 +0200)
commit0c53d91f3bfe7bbd8d8b9ffd332ac2f57b6aba34
tree724bd17a5ed9d89827b3095e149cfda4fb10fe61
parent17bfd000d7d44ff13cf7becbfd9ce08b896d66eb
parent75e78d4e239a5c999306e92b181b0e29c52dc9db
fix merge conflict
CHANGELOG.md