From 5fcf73efb28ebee9d0f225ed9853eed3df17d2fc Mon Sep 17 00:00:00 2001
From: Oscar Vestlie <oxv@google.com>
Date: Tue, 14 Nov 2023 15:36:30 -0800
Subject: [PATCH] Add content to test_file (#552) (#563)

(cherry picked from commit d24b26aee0b96dad2131544f1750080e7eac31e7)
---
 test_file | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test_file b/test_file
index 180cf8328022b..248a88106bd87 100644
--- a/test_file
+++ b/test_file
@@ -1 +1,5 @@
+<<<<<<< HEAD
 test2
+=======
+test
+>>>>>>> d24b26aee0b (Add content to test_file (#552) (#563))