From e63bac3128a5ce584c904ee247ce5cafc5d0c56a Mon Sep 17 00:00:00 2001
From: Kevin Newton <kddnewton@gmail.com>
Date: Fri, 18 Aug 2023 20:47:58 -0400
Subject: [PATCH] [ruby/yarp] Rename statements to body where appropriate

https://github.com/ruby/yarp/commit/0aa7d9d10c
---
 yarp/yarp.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/yarp/yarp.c b/yarp/yarp.c
index 407c71a5dc..d521b7ead9 100644
--- a/yarp/yarp.c
+++ b/yarp/yarp.c
@@ -2694,10 +2694,14 @@ yp_lambda_node_create(
         .locals = *locals,
         .opening_loc = YP_LOCATION_TOKEN_VALUE(opening),
         .parameters = parameters,
+<<<<<<< HEAD:yarp/yarp.c
 <<<<<<< HEAD:yarp/yarp.c
         .body = body
 =======
         .statements = statements
+=======
+        .body = body
+>>>>>>> 0aa7d9d10c (Rename statements to body where appropriate):src/yarp.c
     };
 
     return node;