From a0ad7dbeec75d9b02523c635078e48e75bf1b2e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=AD=90=E6=AD=AA?= Date: Sat, 22 Aug 2026 22:50:54 +0800 Subject: [PATCH] Merge branch 'master' of https://github.com/RfidResearchGroup/proxmark3 into 20260819-gdmfix --- doc/commands.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/doc/commands.json b/doc/commands.json index adf033844..425709a23 100644 --- a/doc/commands.json +++ b/doc/commands.json @@ -16139,14 +16139,8 @@ } }, "metadata": { -<<<<<<< HEAD "commands_extracted": 901, "extracted_by": "PM3Help2JSON v1.00", "extracted_on": "2026-08-22T14:19:35+00:00" -======= - "commands_extracted": 902, - "extracted_by": "PM3Help2JSON v1.00", - "extracted_on": "2026-08-21T18:43:14+00:00" ->>>>>>> b4c4edd7c94a989108cacaaaf73805a28a6c217c } }