[flang-commits] [flang] 75a9ffd - [flang][NFC] Fixed a merge artifact in Intrinsics.md (#173443)

[via flang-commits]

Author: Eugene Epshteyn
Date: 2025-12-23T21:59:05-05:00
New Revision: 75a9ffdc0dd0a50acdadae011d36bf35e55d05da

URL: https://github.com/llvm/llvm-project/commit/75a9ffdc0dd0a50acdadae011d36bf35e55d05da
DIFF: https://github.com/llvm/llvm-project/commit/75a9ffdc0dd0a50acdadae011d36bf35e55d05da.diff

LOG: [flang][NFC] Fixed a merge artifact in Intrinsics.md (#173443)

Removed "HEAD" line from some past merge.

Added: 
    

Modified: 
    flang/docs/Intrinsics.md

Removed: 
    


################################################################################
diff  --git a/flang/docs/Intrinsics.md b/flang/docs/Intrinsics.md
index 6451fc48fc6a2..faae4ae2aab9d 100644
--- a/flang/docs/Intrinsics.md
+++ b/flang/docs/Intrinsics.md
@@ -1414,7 +1414,6 @@ This is prefixed by `STRING`, a colon and a space.
 - **Class:** subroutine
 - **Syntax:** `CALL PERROR(STRING)`
 
-<<<<<<< HEAD
 ### Non-Standard Intrinsics: SRAND
 
 #### Description