mirror of
https://github.com/RetroDECK/RetroDECK.git
synced 2024-11-25 23:45:39 +00:00
On branch cooker
Changes to be committed: modified: automation_tools/automation_task_list.cfg modified: tools/configurator/data_list.json
This commit is contained in:
parent
56e71eb7a7
commit
835f900138
0
RetroDECK-cooker.flatpak.sha
Normal file
0
RetroDECK-cooker.flatpak.sha
Normal file
|
@ -405,8 +405,4 @@
|
|||
]
|
||||
}
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
}
|
||||
=======
|
||||
}
|
||||
>>>>>>> 62724325fd58f43d1c9a4b0dbcc0c891e20ad54d
|
||||
|
|
Loading…
Reference in a new issue