Permalink
Browse files

Ugh merge fail.

  • Loading branch information...
1 parent 7fecb8f commit 1ffd99e57acb3edfd2e04eb62de23e3f0813fe01 @shazow committed Jun 16, 2012
Showing with 0 additions and 1 deletion.
  1. +0 −1 CHANGES.rst
View
@@ -14,7 +14,6 @@ Changes
* IPv6 url support. (Issue #72)
->>>>>>> master
1.3 (2012-03-25)
++++++++++++++++

0 comments on commit 1ffd99e

Please sign in to comment.