Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Clean merge issues.
  • Loading branch information
elland committed Nov 27, 2013
1 parent 9fbf738 commit 94f7c65
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions socrates/socrates.py
Expand Up @@ -430,6 +430,7 @@ def make_atom(self):
posts = self.posts[:n]
else:
posts = self.posts

contents = self.render(self.ATOM, self._v({'posts': posts, 'now':
self._get_atom_date()}))

Expand Down

0 comments on commit 94f7c65

Please sign in to comment.