Fixing conflicts

This commit is contained in:
UberGuidoZ 2023-12-09 17:07:12 -08:00 committed by GitHub
parent ca86974c98
commit bb8488c6dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -139,4 +139,4 @@ name: Exit
type: parsed
protocol: RC5
address: 00 00 00 00
command: 0F 00 00 00
command: 0F 00 00 00