tunnel.py: fix conflict
authorJondy Zhao <jondy.zhao@gmail.com>
Mon, 21 Oct 2013 01:47:12 +0000 (09:47 +0800)
committerJondy Zhao <jondy.zhao@gmail.com>
Mon, 21 Oct 2013 01:47:12 +0000 (09:47 +0800)
commiteb9a92379d40c9773709120ad43aed315fdd547b
tree2e886c3df2862ca580f08edd3ae8bc9d3bfaf9c6
parent50275cc2935c9791aa26d2d3822712fcf9c8266e
tunnel.py: fix conflict
re6st/tunnel.py