resolve git conflict
authorweiyu <weiyuluo1232@gmail.com>
Mon, 1 Jul 2019 18:59:13 +0000 (11:59 -0700)
committerweiyu <weiyuluo1232@gmail.com>
Mon, 1 Jul 2019 18:59:13 +0000 (11:59 -0700)
commit0bcdc6472ef63a9bd55a8e7bde3d103708e48078
treef8d0dc2ac8cf3795dc87f8dbabbab827bf52f549
parenta1280c133564afec30de10cc1de12a23b02a13d0
resolve git conflict
Makefile