Fix mismerge of if.c
authorMikael Magnusson <mikachu@gmail.com>
Thu, 24 Apr 2014 22:22:22 +0000 (00:22 +0200)
committerMikael Magnusson <mikachu@gmail.com>
Thu, 24 Apr 2014 22:22:22 +0000 (00:22 +0200)
commit81593851153b90845e07a62c9fe5e8bc6e36f805
tree2df3227bd1846cc160593554aa52adfbccfd4614
parent25a5ffb0b7faef992f20f6923c3b296145c6fc60
Fix mismerge of if.c
openbox/actions.c
openbox/actions/if.c