Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RESOURCE] Add new entries for different types #1414

Merged
merged 6 commits into from
Jan 22, 2025
Merged

Conversation

@PaoloFoti
Copy link
Collaborator Author

@Asi0Flammeus in my last commit (8f733a4) I resolved a conflict regarding a typo inside bitcoin4india (location typo: india in dev, changed with India from my branch). Please take a double look on that to ensure my commit is not gonna mess up things or do reverts, thx

@PaoloFoti
Copy link
Collaborator Author

maybe you'll need to revert my last commit

@Asi0Flammeus
Copy link
Collaborator

Asi0Flammeus commented Jan 22, 2025

Everything seems good to me. Your merge conflict seems to only change the for conference BTC4India (change location and remove builder).
Was that your intent? @PaoloFoti

@PaoloFoti
Copy link
Collaborator Author

yes regarding change location (new location is "India"), but I added the builder, its name shall be "Bitcoin4India".

@Asi0Flammeus
Copy link
Collaborator

In this PR, that builder is not created

@Asi0Flammeus Asi0Flammeus merged commit 99a8946 into dev Jan 22, 2025
@PaoloFoti
Copy link
Collaborator Author

you are right, I created it in the past one, it is already on mainnet

@PaoloFoti PaoloFoti deleted the january-new-resources branch January 22, 2025 23:36
Asi0Flammeus pushed a commit that referenced this pull request Jan 29, 2025
* books, 3 added

* yt channel, 1 added

* yt channels, 2 added

* resources, different types added

* resources, new entries of different types
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment