From: Grigorii Demidov Date: Mon, 1 Jun 2015 10:18:33 +0000 (+0200) Subject: tests: test_cache.c conflict fixed X-Git-Tag: v1.0.0-beta1~128^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18d646dddef1235fb569b36aa86f373bf905bd93;p=thirdparty%2Fknot-resolver.git tests: test_cache.c conflict fixed --- 18d646dddef1235fb569b36aa86f373bf905bd93