More merge failure cleanups
authorMagnus Hagander <magnus@hagander.net>
Sun, 2 Sep 2018 17:33:24 +0000 (19:33 +0200)
committerMagnus Hagander <magnus@hagander.net>
Sun, 2 Sep 2018 17:33:24 +0000 (19:33 +0200)
commit96994a3ba3a248fe9a40cf717c46eeaf38254b79
treef2aef856ffd1743a13246ae87ca36e14a184751b
parent2a7e6b4065a3e2022b25344ffde47c50f0d195b2
More merge failure cleanups
postgresqleu/newsevents/feeds.py