Descriptions should always allow multiline format, so no need to explicitly mention it on just two tags

Author: ashnazg

proposed/phpdoc-tags.md

@@ -604,9 +604,6 @@ single parameter of a function or method. When provided it MUST contain a
 @param tags are omitted due to all useful info already being visible in the
 code signature itself. The description is OPTIONAL yet RECOMMENDED.
 
-The @param tag MAY have a multi-line description and does not need explicit
-delimiting.
-
 It is RECOMMENDED when documenting to use this tag with every function and
 method.
 
@@ -693,9 +690,6 @@ function or method. When provided, it MUST contain a "Type"
 to indicate what is returned; the description on the other hand is OPTIONAL yet
 RECOMMENDED in case of complicated return structures, such as associative arrays.
 
-The @return tag MAY have a multi-line description and does not need explicit
-delimiting.
-
 It is RECOMMENDED to use this tag with every function and method.
 If no `@return` type is given, and no return type declaration is provided in
 the code signature, an interpreter MUST interpret this as if `@return mixed`
@@ -928,7 +922,6 @@ function initializeXml()
 }
 ```
 
-<<<<<<< HEAD
 ```php
 /**
  * @uses MyView.php

proposed/phpdoc.md

@@ -118,7 +118,6 @@ interpreted as described in [RFC 2119][RFC2119].
   }
   ```
 
-<<<<<<< HEAD
   It is NOT RECOMMENDED to use compound definitions for Constants or Properties, since the
   handling of DocBlocks in these situations can lead to unexpected results. If compound statement is
   used each element SHOULD have a preceding DocBlock.