Remove mismerge-added files
authorMikael Magnusson <mikachu@gmail.com>
Sat, 13 Feb 2010 02:43:56 +0000 (03:43 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Sat, 13 Feb 2010 02:43:56 +0000 (03:43 +0100)
commitf011ce4c994830079a72bfe522ea0c0ff1185ffd
tree8731a62da99c676f92b5a93a7d295998cd2e7e49
parent1265a23e5318f12d5f64a084198e4d942af83c19
Remove mismerge-added files
openbox/prop.c [deleted file]
openbox/prop.h [deleted file]