]> git.ipfire.org Git - thirdparty/pdns.git/commit
projects / thirdparty / pdns.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 7b0db01) | patch
Actually fix the mans conflict.
authortcely <tcely@users.noreply.github.com>
Tue, 1 Aug 2017 04:11:45 +0000 (00:11 -0400)
committertcely <tcely@users.noreply.github.com>
Thu, 24 May 2018 15:32:44 +0000 (11:32 -0400)
commit430697159b94553679ee43542157d5c78ca99690
tree934b4c1c4ee777703d5033fc8589696581d0ae84tree | snapshot
parent7b0db01fdf81935d53e335568ed369611b730af6commit | diff
Actually fix the mans conflict.

This was a parallel build problem.
I had misunderstood what was actually happening when I first read the logs.
docs/Makefile.am diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.