mirror of
https://github.com/UberGuidoZ/Flipper.git
synced 2024-12-21 22:10:12 +00:00
Updated submodule
This commit is contained in:
commit
142490679c
3
.gitmodules
vendored
3
.gitmodules
vendored
@ -70,9 +70,12 @@
|
||||
[submodule "BadUSB/BadGPT"]
|
||||
path = BadUSB/BadGPT
|
||||
url = https://github.com/ooovenenoso/BadUSB-GPT
|
||||
<<<<<<< HEAD
|
||||
[submodule "NFC/Infinity"]
|
||||
path = NFC/Infinity
|
||||
url = https://github.com/FalsePhilosopher/Flipper-Infinity
|
||||
[submodule "NFC/Amiibo/Infinity-FalsePhilosopher"]
|
||||
path = NFC/Amiibo/Infinity-FalsePhilosopher
|
||||
url = https://github.com/FalsePhilosopher/Flipper-Infinity
|
||||
=======
|
||||
>>>>>>> 362f5cac03daa2179937ad9e5ac3748ed4b7bcbc
|
||||
|
Loading…
Reference in New Issue
Block a user