Deal with auto-merger misery

ojhunt · ojhunt · commit d7f5c3ef183a · 2025-04-24T20:56:46.000-07:00
diff --git a/clang/lib/CodeGen/CGBlocks.h b/clang/lib/CodeGen/CGBlocks.h
@@ -145,7 +145,6 @@ class BlockByrefInfo {
 /// entity that's captured by a block.
 enum class BlockCaptureEntityKind {
   None,
-  AddressDiscriminatedPointerAuth,
   CXXRecord, // Copy or destroy
   AddressDiscriminatedPointerAuth,
   ARCWeak,
