Repair merge conflict

twitter-archive · Mar 5, 2010 · bb90135 · bb90135
2 parents 0aeb418 + e34bbf4
commit bb90135
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/autolink.yml b/autolink.yml
@@ -247,6 +247,14 @@ tests:
       text: "See http://example.com example.com"
       expected: "See <a href=\"http://example.com\">http://example.com</a> example.com"
 
+    - description: "Autolink url that includes @-sign and numeric dir under it"
+      text: "http://www.flickr.com/photos/29674651@N00/4382024406"
+      expected: "<a href=\"http://www.flickr.com/photos/29674651@N00/4382024406\">http://www.flickr.com/photos/29674651@N00/4382024406</a>"
+
+    - description: "Autolink url that includes @-sign and non-numeric dir under it"
+      text: "http://www.flickr.com/photos/29674651@N00/foobar"
+      expected: "<a href=\"http://www.flickr.com/photos/29674651@N00/4382024406\">http://www.flickr.com/photos/29674651@N00/foobar</a>"
+
   all:
     - description: "Autolink url does not overlap @username"
       text: "Check out: http://example.com/test&@chasesechrist"