fix broken merge
authoradrianna <adrianna.pinska@gmail.com>
Thu, 15 May 2014 18:28:04 +0000 (20:28 +0200)
committeradrianna <adrianna.pinska@gmail.com>
Thu, 15 May 2014 18:28:13 +0000 (20:28 +0200)
commit66f2b3f4dd046e850666cdf42d61d19a055cda02
tree4ea701498376486cdf06ccb647b79f4427397ccb
parent5e5fbf3243e0d54ad3b69b5831a0e9df77eceea2
fix broken merge
naja/widgets/tile.py