Changeset 950


Ignore:
Timestamp:
Jul 27, 2010, 8:26:51 AM (9 years ago)
Author:
mnot@…
Message:

remove merged text

File:
1 edited

Legend:

Unmodified
Added
Removed
  • draft-ietf-httpbis/latest/p6-cache.xml

    r949 r950  
    856856</t>
    857857<t>
    858 <<<<<<< .mine
    859858   The following HTTP methods &MUST; cause a cache to invalidate the Effective
    860859   Request URI (&effective-request-uri;) as well as the URI(s) in the Location
     
    865864      <t>POST</t>
    866865   </list>
    867 =======
    868   In a succesful exchange (&status.2xx;), the following HTTP methods &MUST; cause a cache
    869   to invalidate the Effective Request URI (&effective-request-uri;) as well
    870   as the URI(s) in the Location and Content-Location headers (if present):
    871   <list style="symbols">
    872     <t>PUT</t>
    873     <t>DELETE</t>
    874     <t>POST</t>
    875   </list>
    876 >>>>>>> .r948
    877866</t>
    878867<t>
Note: See TracChangeset for help on using the changeset viewer.