[FS#1510] busybox conflicts with flock

[LEDE Bugs]

A new Flyspray task has been opened.  Details are below. 

User who did this - Stijn Tintel (stintel) 

Attached to Project - OpenWrt/LEDE Project
Summary - busybox conflicts with flock
Task Type - Bug Report
Category - Base system
Status - New
Assigned To - 
Operating System - All
Severity - Low
Priority - Medium
Reported Version - Trunk
Due in Version - Undecided
Due Date - Undecided
Details - OpenWrt master r6735-1a89547957

Collected errors:
 * check_data_file_clashes: Package flock wants to install file /home/stijn/Development/LEDE/source/build_dir/target-x86_64_musl/root-x86/usr/bin/flock
        But that file is already provided by package  * busybox
 * opkg_install_cmd: Cannot install package flock.

More information can be found at the following URL:
https://bugs.openwrt.org/index.php?do=details&task_id=1510