]> granicus.if.org Git - gc/commitdiff
Resolve minor merge conflict in gc_disclaim.h, disclaim_bench.c
authorIvan Maidanski <ivmai@mail.ru>
Fri, 30 Sep 2011 13:40:43 +0000 (17:40 +0400)
committerIvan Maidanski <ivmai@mail.ru>
Fri, 30 Sep 2011 13:40:43 +0000 (17:40 +0400)

Trivial merge