Merge pull request #2977 from orestisf1993/issue-1627

author Ingo Bürk <admin@airblader.de>

Sat, 23 Sep 2017 08:40:34 +0000 (10:40 +0200)

committer GitHub <noreply@github.com>

Sat, 23 Sep 2017 08:40:34 +0000 (10:40 +0200)
author Ingo Bürk <admin@airblader.de>
Sat, 23 Sep 2017 08:40:34 +0000 (10:40 +0200)
committer GitHub <noreply@github.com>
Sat, 23 Sep 2017 08:40:34 +0000 (10:40 +0200)
diff --cc src/con.c
Simple merge
diff --cc src/floating.c
Simple merge
author	Ingo Bürk <admin@airblader.de>
	Sat, 23 Sep 2017 08:40:34 +0000 (10:40 +0200)
committer	GitHub <noreply@github.com>
	Sat, 23 Sep 2017 08:40:34 +0000 (10:40 +0200)
		1	2
src/con.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/floating.c	patch \|	diff1 \|	diff2 \|	blob \| history