File tree Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Expand file tree Collapse file tree 1 file changed +5
-1
lines changed Original file line number Diff line number Diff line change @@ -5,4 +5,8 @@ Management tools for a Pokémon Living Dex.
5
5
- Code by [ Posho] ( https://github.com/PoshoDev ) .
6
6
- Ripped sprites by [ msikma] ( https://github.com/msikma ) from [ PokéSprite] ( http://msikma.github.io/pokesprite/ ) .
7
7
- [ Non-sandboxed Filesystem] ( https://yellowafterlife.itch.io/gamemaker-nsfs ) by [ YAL] ( https://github.com/YellowAfterlife ) .
8
- - [ CSV Manager] ( https://marketplace.yoyogames.com/assets/522/csv-manager ) by [ derme] ( https://github.com/derme302 ) .
8
+ <<<<<<< HEAD
9
+ - [ CSV Manager] ( https://marketplace.yoyogames.com/assets/522/csv-manager ) by [ derme] ( https://github.com/derme302 ) .
10
+ =======
11
+ - [ CSV Manager] ( https://marketplace.yoyogames.com/assets/522/csv-manager ) by [ derme] ( https://github.com/derme302 ) .
12
+ >>>>>>> e8314b37d8fc404a882b7e392838aad2398387d5
You can’t perform that action at this time.
0 commit comments