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

Eugene Epshteyn via flang-commits flang-commits at lists.llvm.org
Tue Dec 23 18:53:24 PST 2025


https://github.com/eugeneepshteyn created https://github.com/llvm/llvm-project/pull/173443

Removed "HEAD" line from some past merge.

>From 6afa3a9b5b17a95738a05352f79a9fb916901ac7 Mon Sep 17 00:00:00 2001
From: Eugene Epshteyn <eepshteyn at nvidia.com>
Date: Tue, 23 Dec 2025 21:50:39 -0500
Subject: [PATCH] [flang][NFC] Fixed a merge artifact in Intrinsics.md

Removed "HEAD" line from some past merge.
---
 flang/docs/Intrinsics.md | 1 -
 1 file changed, 1 deletion(-)

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



More information about the flang-commits mailing list