Resolve merge conflict
2a85454d7a42
Actions

Authored by ndavis on Nov 22 2018, 12:05 AM.

Description

Resolve merge conflict

Summary: Resolve issue from previous commit

Reviewers: VDG, ngraham, nicolasfella, KDE Connect

Reviewed By: VDG, ngraham, nicolasfella, KDE Connect

Subscribers: cfeck, trickyricky26, abetts, ngraham, rizzitello, nicolasfella, kde-frameworks-devel

Committed

ndavis

Nov 22 2018, 12:05 AM

Reviewer

VDG

Differential Revision

D16951: Resolve merge conflict

Parents

R266:6976172920e2: Add mouse button icons

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			icons-dark/actions/16/dialog-input-devices.svg
	M			icons/actions/16/dialog-input-devices.svg