Merge branch 'master' of github.com:statesofpop/django-cal

Conflicts: README.md
statesofpop · Jan 9, 2013 · 65a5be3 · 65a5be3
2 parents d151767 + 83c6db5
commit 65a5be3
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -76,8 +76,6 @@ Define either duration or end time, never both.
 `self.get_object` can be overriden to allow for more complex events, as is possible for
 [syndication feeds](https://docs.djangoproject.com/en/1.2/ref/contrib/syndication/#a-complex-example).
 
-
-
 ## Dependencies ##
 
   * [vObject](http://vobject.skyhouseconsulting.com/)