summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorExpoSeed <43502820+ExpoSeed@users.noreply.github.com>2021-06-10 10:58:53 -0500
committerExpoSeed <43502820+ExpoSeed@users.noreply.github.com>2021-06-10 10:58:53 -0500
commit7796308f0130fb75c113e810b2b5e7ae893ac442 (patch)
tree08a0c7983a1b3e8494269e20e45cf64457bf16fb
parentc94b75eea2a357be17e47368c6608bb3a961f61e (diff)
Updated Feature Branches (markdown)
-rw-r--r--Feature-Branches.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/Feature-Branches.md b/Feature-Branches.md
index 78d3846..460638e 100644
--- a/Feature-Branches.md
+++ b/Feature-Branches.md
@@ -5,7 +5,7 @@ The following branches maintained by contributors can be a good starting point f
- [battle_engine](#battle_engine)
- [pokemon_expansion](#pokemon_expansion)
- [item_expansion](#item_expansion)
-- [expansion master](#expansion-master)
+- [pokeemerald Expansion master](#pokeemerald-Expansion-master)
- [follow_me](#follow_me)
## How to apply a feature branch
@@ -72,7 +72,7 @@ Items from future games backported to pokeemerald. Features include:
For more information see [pokeemerald Expansion's wiki](https://github.com/rh-hideout/pokeemerald-expansion/wiki).
-## [expansion master](https://github.com/rh-hideout/pokeemerald-expansion/tree/master)
+## [pokeemerald Expansion master](https://github.com/rh-hideout/pokeemerald-expansion/tree/master)
Maintainers: ROM Hacking Hideout
Combines `battle_engine`, `pokemon_expansion`, and `item_expansion` into a single convenient branch, reducing the amount of character building merge conflicts you have to deal with.