From 1d9901d0fde300d437b9696e48c25b7f14eeccb9 Mon Sep 17 00:00:00 2001 From: AfonsoCMSousa Date: Mon, 25 May 2026 15:30:44 +0100 Subject: [PATCH] merge: fixed merge conflic... --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 1f0cc4f..a83e624 100644 --- a/.gitignore +++ b/.gitignore @@ -10,5 +10,5 @@ /.env /imgui.ini -Playertracker +PlayerTracker *.json