Fixed conflicts - sway - i3-compatible Wayland compositor

commit 912702f030daa7f00a776e904a6c895b41ba30a8
parent daea22bc8920fea1d6fba923169173a2bbdc75f9
Author: Luminarys <kizunanohikari@gmail.com>
Date:   Wed, 19 Aug 2015 12:07:51 -0500

Fixed conflicts

	sway i3-compatible Wayland compositor
	git clone https://git.awy.one/sway
	Log \| Files \| Refs \| README \| LICENSE