public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-08-05 16:58:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixing DF users.

Browse source
This commit is contained in:
Samuel Clay 2014-09-05 18:17:07 -07:00
parent 6be5d1c595
commit ec7847a922
2 changed files with 14563 additions and 14563 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/rss_feeds/models.py
View file

@ -233,7 +233,7 @@ class Feed(models.Model):
return
if self.pk != duplicate_feeds[0].pk:
logging.debug(" ---> ~FRFound different feed (%s), merging..." % duplicate_feeds[0])
logging.debug(" ---> ~FRFound different feed (%s), merging %s in..." % (duplicate_feeds[0], self.pk))
feed = Feed.get_by_id(merge_feeds(duplicate_feeds[0].pk, self.pk))
return feed

29124
utils/backups/users.txt
View file

File diff suppressed because it is too large Load diff