Browse files

removed some diff errors

  • Loading branch information...
1 parent 045b596 commit 5a69229c976016570470ae56d57eb98551c3b438 @pfefferle committed Feb 21, 2012
Showing with 0 additions and 7 deletions.
  1. +0 −7 readme.txt
View
7 readme.txt
@@ -2,12 +2,6 @@
Contributors: Matthias Pfefferle
Donate link: http://www.14101978.de
Tags: OpenID, XRD, well-known, XML, Discovery
-<<<<<<< HEAD
-Requires at least: 3.1
-Tested up to: 3.2
-Stable tag: 0.5
-
-=======
Requires at least: 3.0.5
Tested up to: 3.2
Stable tag: 0.5.1
@@ -16,7 +10,6 @@ This plugin enables "Well-Known URIs" support for WordPress
== Description ==
->>>>>>> lower requirements
This plugin enables "Well-Known URIs" support for WordPress (RFC 5785: http://tools.ietf.org/html/rfc5785).
From the RFC:

0 comments on commit 5a69229

Please sign in to comment.