Fix a merge problem.
authorZoltan Varga <vargaz@gmail.com>
Fri, 12 Nov 2010 20:12:05 +0000 (21:12 +0100)
committerZoltan Varga <vargaz@gmail.com>
Mon, 3 Jan 2011 14:42:43 +0000 (15:42 +0100)
commit211234aaab9453f51035fdd84e8d96f5f4d2180f
tree092f5f17b880724967da0a49056a7813ccf6d8ea
parent9609a25c23a5e0ae1aeae0a8e2ca1bc90af5b4a1
Fix a merge problem.
mono/mini/debugger-agent.c