This repository has been archived by the owner on Aug 23, 2024. It is now read-only.
merge pr #40
Merged
merge pr #40
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Had to redo repo due to to many conflicts.
Development
ATOMNFT
added a commit
to ATOMNFT/MULTI-Minigotchi-ESP32
that referenced
this pull request
Jun 28, 2024
commit f684e94 Merge: 34f3351 6efa522 Author: ATOMNFT <[email protected]> Date: Fri Jun 28 07:24:06 2024 -0500 Merge branch 'development' of https://github.com/ATOMNFT/MULTI-Minigotchi-ESP32 into development commit 34f3351 Author: ATOMNFT <[email protected]> Date: Fri Jun 28 07:04:08 2024 -0500 Cleaning commit 388c7bf Author: ATOMNFT <[email protected]> Date: Fri Jun 28 07:03:06 2024 -0500 Cleaning commit 6efa522 Merge: 6cd0afc 1554331 Author: dj1ch <[email protected]> Date: Thu Jun 27 07:24:54 2024 -0700 Merge pull request dj1ch#40 from dj1ch/main merge pr
ATOMNFT
added a commit
to ATOMNFT/MULTI-Minigotchi-ESP32
that referenced
this pull request
Jun 28, 2024
commit 3275a8f Author: ATOMNFT <[email protected]> Date: Fri Jun 28 07:31:16 2024 -0500 Removed junk commit 65cf381 Author: ATOMNFT <[email protected]> Date: Fri Jun 28 07:30:44 2024 -0500 Repo repair commit ac536a7 Author: ATOMNFT <[email protected]> Date: Fri Jun 28 07:29:53 2024 -0500 Squashed commit of the following: commit f684e94 Merge: 34f3351 6efa522 Author: ATOMNFT <[email protected]> Date: Fri Jun 28 07:24:06 2024 -0500 Merge branch 'development' of https://github.com/ATOMNFT/MULTI-Minigotchi-ESP32 into development commit 34f3351 Author: ATOMNFT <[email protected]> Date: Fri Jun 28 07:04:08 2024 -0500 Cleaning commit 388c7bf Author: ATOMNFT <[email protected]> Date: Fri Jun 28 07:03:06 2024 -0500 Cleaning commit 6efa522 Merge: 6cd0afc 1554331 Author: dj1ch <[email protected]> Date: Thu Jun 27 07:24:54 2024 -0700 Merge pull request dj1ch#40 from dj1ch/main merge pr commit 46f9ec7 Author: ATOMNFT <[email protected]> Date: Fri Jun 28 07:27:54 2024 -0500 Repo Repair commit 500266f Merge: 5772c99 1554331 Author: ATOMNFT <[email protected]> Date: Fri Jun 28 07:17:00 2024 -0500 Merge branch 'main' of https://github.com/ATOMNFT/MULTI-Minigotchi-ESP32 commit 5772c99 Author: ATOMNFT <[email protected]> Date: Fri Jun 28 07:15:35 2024 -0500 Cleaning commit efc2333 Author: ATOMNFT <[email protected]> Date: Fri Jun 28 07:09:01 2024 -0500 Organizing commit edc1fa5 Author: ATOMNFT <[email protected]> Date: Fri Jun 28 07:07:45 2024 -0500 Update README.md commit f41b43f Author: ATOMNFT <[email protected]> Date: Fri Jun 28 07:05:40 2024 -0500 Added user_setup files commit 0d829c7 Author: ATOMNFT <[email protected]> Date: Fri Jun 28 07:04:59 2024 -0500 Cleaning commit 5920700 Author: ATOMNFT <[email protected]> Date: Thu Jun 27 08:57:32 2024 -0500 Fixed delays & merge errors commit 1ada9bf Author: ATOMNFT <[email protected]> Date: Wed Jun 26 15:47:40 2024 -0500 Updated User_setup files commit 325f0d2 Author: ATOMNFT <[email protected]> Date: Wed Jun 26 14:18:34 2024 -0500 Added updated files commit 1fcce62 Merge: 1c7abf0 4b19e1f Author: ATOMNFT <[email protected]> Date: Wed Jun 26 14:15:23 2024 -0500 Merge branch 'main' of https://github.com/ATOMNFT/MULTI-Minigotchi-ESP32 commit 1c7abf0 Author: ATOMNFT <[email protected]> Date: Wed Jun 12 11:37:01 2024 -0500 Update INSTALL.md commit f8ed260 Author: ATOMNFT <[email protected]> Date: Tue Jun 11 14:08:34 2024 -0500 Apply restyled patch commit 3f280ce Author: ATOMNFT <[email protected]> Date: Mon Jun 10 23:59:53 2024 -0500 Added t-display user_setup commit 67cfbcd Author: ATOMNFT <[email protected]> Date: Mon Jun 10 09:45:41 2024 -0500 Apply restyled patch commit b8b37d3 Merge: f971a2d a37f28d Author: ATOMNFT <[email protected]> Date: Mon Jun 10 09:35:38 2024 -0500 Merge branch 'main' into main commit f971a2d Author: ATOMNFT <[email protected]> Date: Mon Jun 10 09:33:53 2024 -0500 Apply restyled patch commit 25efa66 Author: ATOMNFT <[email protected]> Date: Mon Jun 10 08:56:53 2024 -0500 Removed zip file commit d1178d0 Author: ATOMNFT <[email protected]> Date: Sat Jun 8 21:06:29 2024 -0500 Update INSTALL.md commit d057d1b Author: ATOMNFT <[email protected]> Date: Sat Jun 8 17:21:20 2024 -0500 Update README.md commit 550180a Author: ATOMNFT <[email protected]> Date: Sat Jun 8 17:19:32 2024 -0500 Added new files commit a64b965 Author: ATOMNFT <[email protected]> Date: Sat Jun 8 17:18:30 2024 -0500 Added User_setup files
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.