[Lunar-commits] <moonbase-core> Merge pull request #45 from Florin65/inetutils

[Auke Kok]

commit 8d65fc3b219a278821a4019d057c3973d703906a
Author: Auke Kok <sofar+github at foo-projects.org>
Date: Sun, 29 Jul 2012 21:26:13 -0700
URL: https://github.com/lunar-linux/moonbase-core/commit/8d65fc3b219a278821a4019d057c3973d703906a

Merge pull request #45 from Florin65/inetutils

inetutils: it conflicts with traceroute too.
---
  net/inetutils/CONFLICTS                                      +1/-0     
  1 files changed, 0 insertions (+), 0 deletions (-)

--- a/net/inetutils/CONFLICTS
+++ b/net/inetutils/CONFLICTS
@@ -1,3 +1,4 @@
 conflicts netkit-base
 conflicts iputils
 conflicts netkit-telnet
+conflicts traceroute