]> git.sur5r.net Git - i3/i3/commit
Fix incorrect merge *sigh* 3170/head
authorMichael Stapelberg <michael@stapelberg.de>
Sat, 10 Mar 2018 20:35:14 +0000 (21:35 +0100)
committerMichael Stapelberg <michael@stapelberg.de>
Sat, 10 Mar 2018 20:35:14 +0000 (21:35 +0100)
commitffcf2bca85707e82ac1def6afb3a4e015dc98dfd
tree48ddee9ba3f2e2db299949163119bbdbeb260059
parentde0ff844e073cb49c2ba78482ae3398c76a90db0
Fix incorrect merge *sigh*
src/con.c
src/handlers.c