From daee1269a91388f06e2a73208605c1250bd8683a Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Tue, 08 Dec 2020 06:28:03 -0500
Subject: Revert "busybox: Conflict with old opkg-lede"

This partially reverts commit 310bb966527e72b1cd884f1efcb0e62481c01e15.

opkg-lede apparently doesn't support versioned conflicts:

    Upgrading busybox on root from 1.21.1-13 to 1.32.0-1...
    Collected errors:
     * check_conflicts_for: The following packages conflict with busybox:
     * check_conflicts_for: 	opkg-lede *
     * opkg_install_cmd: Cannot install package busybox.
---
(limited to 'busybox.pkg')

diff --git a/busybox.pkg/control b/busybox.pkg/control
index 163fd2d..46ff9ec 100644
--- a/busybox.pkg/control
+++ b/busybox.pkg/control
@@ -3,7 +3,6 @@ Platform: any
 Essential: yes
 Section: util
 Depends: ${Shlib-Depends}, ${Extra-Depends}
-Conflicts: opkg-lede (<< 0+git20190131.d4ba162-7)
 Description: Multi-call binary that combines many common UNIX utilities
  BusyBox combines tiny versions of many common UNIX utilities into a single
  small executable. It provides replacements for most of the utilities you
--
cgit v0.9.1