From 70bbb0b25554659571f5ab631d9741f8901f77ee Mon Sep 17 00:00:00 2001
From: MaranBr <maranbr@outlook.com>
Date: Tue, 9 Dec 2025 08:19:48 -0400
Subject: [PATCH] Fix remaining conflicts

---
 src/android/app/src/main/res/values/strings.xml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/android/app/src/main/res/values/strings.xml b/src/android/app/src/main/res/values/strings.xml
index b81a0074d2..ef8082a849 100644
--- a/src/android/app/src/main/res/values/strings.xml
+++ b/src/android/app/src/main/res/values/strings.xml
@@ -105,11 +105,6 @@
     <string name="sample_shading_fraction_description">The intensity of the sample shading pass. Higher values improve quality more but also reduce performance to a greater extent.</string>
 
     <string name="veil_renderer">Renderer</string>
-<<<<<<< HEAD
-=======
-    <string name="frame_interpolation">Enhanced Frame Pacing</string>
-    <string name="frame_interpolation_description">Ensures smooth and consistent frame delivery by synchronizing the timing between frames, reducing stuttering and uneven animation. Ideal for games that experience frame timing instability or micro-stutters during gameplay.</string>
->>>>>>> 82bb0a3294a5ec9396a27e1f70b3472e5156768d
     <string name="sync_memory_operations">Sync Memory Operations</string>
     <string name="sync_memory_operations_description">Ensures data consistency between compute and memory operations. This option should fix issues in some games, but may also reduce performance in some cases. Unreal Engine 4 games often see the most significant changes thereof.</string>
     <string name="buffer_reorder_disable">Disable Buffer Reorder</string>