fix conflict
authorPeng Li <seudut@gmail.com>
Fri, 3 Mar 2017 16:05:47 +0000 (00:05 +0800)
committerPeng Li <seudut@gmail.com>
Fri, 3 Mar 2017 16:05:47 +0000 (00:05 +0800)
commit93c731adebc5c2770ac869d53add87f3f6324d6c
tree850088a0c2ea23e9262eb440ef270c537514741c
parent6216426030de06ca5eafe32f4913396ab7802243
fix conflict
posts/linux-note.org