From: Grigorii Demidov <grigorii.demidov@nic.cz>
Date: Mon, 23 Jan 2017 11:11:44 +0000 (+0100)
Subject: lib/utils: Merge conflicts were resolved
X-Git-Tag: v1.2.0-rc3~3^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed3a19e8aa7f521c777ab06ae2bb7ccd195bb2b0;p=thirdparty%2Fknot-resolver.git

lib/utils: Merge conflicts were resolved
---

ed3a19e8aa7f521c777ab06ae2bb7ccd195bb2b0