Remove Conflicts: peripheral-bus to fix MIC errors 21/260621/2 accepted/tizen/unified/20210630.015242 submit/tizen/20210630.020200
authorHyotaek Shim <hyotaek.shim@samsung.com>
Wed, 30 Jun 2021 01:59:40 +0000 (10:59 +0900)
committerHyotaek Shim <hyotaek.shim@samsung.com>
Wed, 30 Jun 2021 02:01:24 +0000 (11:01 +0900)
commitb7e20d3e4d0aa90b1ac19bf6ac31131b0a226f71
tree50727e2219e33337ed41c75e5493403d6c9a3bf8
parentfc4b90616878ae5d1043a6c5c40f91dc6207ce0c
Remove Conflicts: peripheral-bus to fix MIC errors

Change-Id: I4d6435989b48c669330fae2f598790a51b6e73d0
Signed-off-by: Hyotaek Shim <hyotaek.shim@samsung.com>
packaging/capi-system-peripheral-io.spec