Skip to content
This repository has been archived by the owner on Aug 23, 2024. It is now read-only.

Development #39

Merged
merged 15 commits into from
Jun 27, 2024
Merged

Development #39

merged 15 commits into from
Jun 27, 2024

Conversation

ATOMNFT
Copy link
Contributor

@ATOMNFT ATOMNFT commented Jun 26, 2024

Added the M5 devices back in.

Copy link
Owner

@dj1ch dj1ch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like there were merge conflicts, make sure you remove the arrows and stuff.

minigotchi-ESP32/config.cpp Outdated Show resolved Hide resolved
minigotchi-ESP32/deauth.cpp Outdated Show resolved Hide resolved
@ATOMNFT
Copy link
Contributor Author

ATOMNFT commented Jun 27, 2024

Looks like there were merge conflicts, make sure you remove the arrows and stuff.

Everything should be corrected now.

@ATOMNFT ATOMNFT closed this Jun 27, 2024
@ATOMNFT ATOMNFT reopened this Jun 27, 2024
Copy link
Owner

@dj1ch dj1ch left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@dj1ch dj1ch merged commit 1554331 into dj1ch:main Jun 27, 2024
4 checks passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants