From 65ba02027d2a9a755c976a4199e6bfa4bc98bc53 Mon Sep 17 00:00:00 2001 From: Alexey Martemyanov Date: Fri, 29 May 2026 08:50:04 +0600 Subject: [PATCH] [2026-05-29] fix: resolved merge conflict in wiki/htpc-bazzite-proton.md --- wiki/htpc-bazzite-proton.md | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/wiki/htpc-bazzite-proton.md b/wiki/htpc-bazzite-proton.md index be8d848f..bcf52c7d 100644 --- a/wiki/htpc-bazzite-proton.md +++ b/wiki/htpc-bazzite-proton.md @@ -33,13 +33,8 @@ on Proton 8.0. - **Rayman Origins** (fixed 2026-05-23 — GE-Proton10-34 + `WINEDLLOVERRIDES=\"d3d9=b\" %command%`) - Samurai Gunn (works but **gamepad not detected**) - GTA V, Cuphead (assumed; not retested) -<<<<<<< HEAD -- **VK GameCenter** (GE-Proton10-34, shared prefix c Lutris, авторизация через Lutris + `vk-login-helper`) -- **Atomic Heart VK** (через VK GameCenter, 97GB, `Data/gamecenter/atomic heart/`, URL-схема `vkplay://play/0.2015959`) -======= -- **VK GameCenter** (GE-Proton10-34, `Data/gamecenter/GameCenter/`) -- **Atomic Heart VK** (через VK GameCenter, 97GB, `Data/gamecenter/atomic heart/`) ->>>>>>> nas/main +|- **VK GameCenter** (GE-Proton10-34, shared prefix c Lutris, авторизация через Lutris + `vk-login-helper`) +|- **Atomic Heart VK** (через VK GameCenter, 97GB, `Data/gamecenter/atomic heart/`, URL-схема `vkplay://play/0.2015959`) - **Doom 3 BFG** (через flatpak Classic-RBDOOM-3-BFG) ## Removed from Steam shortcuts ✅