Permalink
Browse files

Removed a conflict label

  • Loading branch information...
1 parent 5eceafc commit 26165ae6bb5eb715dce5c368fb5d8928cd6ba336 @crustymonkey committed Dec 23, 2012
Showing with 0 additions and 1 deletion.
  1. +0 −1 boto/route53/connection.py
@@ -415,4 +415,3 @@ def _make_qualified(self, value):
if value and not value[-1] == '.':
value = "%s." % value
return value
->>>>>>> 412c2e9fc1c33ea413b7ac497072627685f22f5e

0 comments on commit 26165ae

Please sign in to comment.