[chore] merge conflict leftover

1 month ago · b3ce496193
1 changed files with 0 additions and 1 deletions
--- a/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/ByteSetting.kt
+++ b/src/android/app/src/main/java/org/yuzu/yuzu_emu/features/settings/model/ByteSetting.kt
@ -10,7 +10,6 @@ import org.yuzu.yuzu_emu.utils.NativeConfig
 enum class ByteSetting(override val key: String) : AbstractByteSetting {
    AUDIO_VOLUME("volume"),
    RENDERER_DYNA_STATE("dyna_state"),
    GPU_LOG_LEVEL("gpu_log_level");
    override fun getByte(needsGlobal: Boolean): Byte = NativeConfig.getByte(key, needsGlobal)